Skip to content

Commit ec8bcd1

Browse files
authored
Kills Goonstation (shiptest-ss13#2122)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Removes the goon folder and replaces everything in it. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> We need the cannabis sprites that match our new ones, but tg's crungled ones will do until we can find 'em Big thanks to Imaginos for the surgery table ### ATTENTION ALL SPRITERS: **In [undefined], when this pr is merged, THESE solars will become our active ones:** ![image](https://github.com/shiptest-ss13/Shiptest/assets/45698967/9fc8de85-7dd5-49b7-883c-f3720bfd68e8) **If YOU want to prevent this fate, please contribute a solar sprite today** ## Why It's Good For The Game We are so back <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: Imaginos, Memed Hams soundadd: Borrows nsv's firealarm noise. soundadd: Borrows tg's printer noise. add: Ports TG's Cannabis sprites. add: Ports the old codersprite solars (I think they came from bay?) del: The entire goon folder. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
1 parent f26bb33 commit ec8bcd1

File tree

24 files changed

+12
-27
lines changed

24 files changed

+12
-27
lines changed

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,3 @@ The TGS DMAPI API is licensed as a subproject under the MIT license.
5757
See the footer of [code/\_\_DEFINES/tgs.dm](./code/__DEFINES/tgs.dm) and [code/modules/tgs/LICENSE](./code/modules/tgs/LICENSE) for the MIT license.
5858

5959
All assets including icons and sound are under a [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.
60-
61-
All assets located in the `goon` and `whitesands/goon` directory are under a [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0/). Assets created by Goonstation.

code/game/machinery/firealarm.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
last_alarm = world.time
125125
var/area/A = get_area(src)
126126
A.firealert(src)
127-
playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75)
127+
playsound(loc, 'sound/machines/FireAlarm.ogg', 75)
128128
if(user)
129129
log_game("[user] triggered a fire alarm at [COORD(src)]")
130130

code/game/objects/structures/tables_racks.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@
578578
/obj/structure/table/optable
579579
name = "operating table"
580580
desc = "Used for advanced medical procedures."
581-
icon = 'goon/icons/obj/surgery.dmi'
581+
icon = 'icons/obj/surgery_table.dmi'
582582
icon_state = "table1"
583583
buildstack = /obj/item/stack/sheet/mineral/silver
584584
smoothing_flags = NONE

code/modules/antagonists/traitor/equipment/Malf_Modules.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module))
615615
cost = 25
616616
power_type = /datum/action/innate/ai/break_fire_alarms
617617
unlock_text = "<span class='notice'>You replace the thermal sensing capabilities of all fire alarms with a manual override, allowing you to turn them off at will.</span>"
618-
unlock_sound = 'goon/sound/machinery/firealarm.ogg'
618+
unlock_sound = 'sound/machines/firealarm.ogg'
619619

620620
/datum/action/innate/ai/break_fire_alarms
621621
name = "Override Thermal Sensors"

code/modules/atmospherics/machinery/airalarm.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
940940
/obj/machinery/airalarm/proc/handle_decomp_alarm()
941941
if(!COOLDOWN_FINISHED(src, decomp_alarm))
942942
return
943-
playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75)
943+
playsound(loc, 'sound/machines/FireAlarm.ogg', 75)
944944
COOLDOWN_START(src, decomp_alarm, 1 SECONDS)
945945

946946
#undef AALARM_MODE_SCRUBBING

code/modules/hydroponics/grown/cannabis.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
maturation = 8
1010
potency = 20
1111
growthstages = 1
12-
growing_icon = 'goon/icons/obj/hydroponics.dmi'
12+
growing_icon = 'icons/obj/hydroponics/growing.dmi'
1313
icon_grow = "cannabis-grow" // Uses one growth icons set for all the subtypes
1414
icon_dead = "cannabis-dead" // Same for the dead icon
1515
genes = list(/datum/plant_gene/trait/repeated_harvest)
@@ -82,7 +82,7 @@
8282

8383
/obj/item/reagent_containers/food/snacks/grown/cannabis
8484
seed = /obj/item/seeds/cannabis
85-
icon = 'goon/icons/obj/hydroponics.dmi'
85+
icon = 'icons/obj/hydroponics/harvest.dmi'
8686
name = "cannabis leaf"
8787
desc = "Recently legalized in most galaxies."
8888
icon_state = "cannabis"

code/modules/paperwork/faxmachine.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ GLOBAL_LIST_EMPTY(alldepartments)
219219
//Prevents copypasta for evil faxes
220220
/obj/machinery/photocopier/faxmachine/proc/handle_animation()
221221
flick(print_anim, src)
222-
playsound(loc, 'goon/sound/machinery/printer_dotmatrix.ogg', 50, 1)
222+
playsound(loc, 'sound/machines/printer.ogg', 50, 1)
223223

224224
/obj/machinery/photocopier/faxmachine/proc/handle_copying(obj/item/incoming)
225225
use_power(active_power_usage)

code/modules/power/solar.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/obj/machinery/power/solar
55
name = "solar panel"
66
desc = "A solar panel. Generates electricity when in contact with sunlight."
7-
icon = 'goon/icons/obj/power.dmi'
7+
icon = 'icons/obj/machines/oldsolars.dmi'
88
icon_state = "sp_base"
99
density = TRUE
1010
use_power = NO_POWER_USE
@@ -227,7 +227,7 @@
227227
/obj/item/solar_assembly
228228
name = "solar panel assembly"
229229
desc = "A solar panel assembly kit, allows constructions of a solar panel, or with a tracking circuit board, a solar tracker."
230-
icon = 'goon/icons/obj/power.dmi'
230+
icon = 'icons/obj/machines/oldsolars.dmi'
231231
icon_state = "sp_base"
232232
item_state = "electropack"
233233
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'

code/modules/power/tracker.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/obj/machinery/power/tracker
77
name = "solar tracker"
88
desc = "A solar directional tracker."
9-
icon = 'goon/icons/obj/power.dmi'
9+
icon = 'icons/obj/machines/oldsolars.dmi'
1010
icon_state = "tracker"
1111
density = TRUE
1212
use_power = NO_POWER_USE

code/modules/unit_tests/plantgrowth_tests.dm

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
states |= icon_states('icons/obj/hydroponics/growing_flowers.dmi')
99
states |= icon_states('icons/obj/hydroponics/growing_mushrooms.dmi')
1010
states |= icon_states('icons/obj/hydroponics/growing_vegetables.dmi')
11-
states |= icon_states('goon/icons/obj/hydroponics.dmi')
1211
var/list/paths = subtypesof(/obj/item/seeds) - /obj/item/seeds - typesof(/obj/item/seeds/sample) - /obj/item/seeds/lavaland
1312

1413
for(var/seedpath in paths)

goon/LICENSE.md

-4
This file was deleted.

goon/README.md

-8
This file was deleted.

goon/icons/obj/hydroponics.dmi

-10.5 KB
Binary file not shown.

goon/icons/obj/power.dmi

-2.9 KB
Binary file not shown.

goon/icons/obj/surgery.dmi

-1.19 KB
Binary file not shown.

goon/sound/machinery/FireAlarm.ogg

-84.8 KB
Binary file not shown.
-75.2 KB
Binary file not shown.

icons/obj/hydroponics/growing.dmi

13 KB
Binary file not shown.

icons/obj/hydroponics/harvest.dmi

5.87 KB
Binary file not shown.

icons/obj/machines/oldsolars.dmi

1.82 KB
Binary file not shown.

icons/obj/surgery_table.dmi

404 Bytes
Binary file not shown.

shiptest.dme

+2-2
Original file line numberDiff line numberDiff line change
@@ -1035,11 +1035,11 @@
10351035
#include "code\game\objects\effects\anomalies\anomalies_gravity.dm"
10361036
#include "code\game\objects\effects\anomalies\anomalies_hallucination.dm"
10371037
#include "code\game\objects\effects\anomalies\anomalies_heartbeat.dm"
1038+
#include "code\game\objects\effects\anomalies\anomalies_melter.dm"
10381039
#include "code\game\objects\effects\anomalies\anomalies_phantom.dm"
10391040
#include "code\game\objects\effects\anomalies\anomalies_plasmasoul.dm"
1040-
#include "code\game\objects\effects\anomalies\anomalies_pyroclastic.dm"
1041-
#include "code\game\objects\effects\anomalies\anomalies_melter.dm"
10421041
#include "code\game\objects\effects\anomalies\anomalies_pulsar.dm"
1042+
#include "code\game\objects\effects\anomalies\anomalies_pyroclastic.dm"
10431043
#include "code\game\objects\effects\anomalies\anomalies_sparkler.dm"
10441044
#include "code\game\objects\effects\anomalies\anomalies_static.dm"
10451045
#include "code\game\objects\effects\anomalies\anomalies_veins.dm"

sound/machines/FireAlarm.ogg

53.1 KB
Binary file not shown.

sound/machines/printer.ogg

41.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)