diff --git a/README.md b/README.md index 0c3f8281189c..7b45a824099d 100644 --- a/README.md +++ b/README.md @@ -57,5 +57,3 @@ The TGS DMAPI API is licensed as a subproject under the MIT license. 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. 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. - -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. diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 16bc0ab2a63d..7d87d34d2be1 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -124,7 +124,7 @@ last_alarm = world.time var/area/A = get_area(src) A.firealert(src) - playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75) + playsound(loc, 'sound/machines/FireAlarm.ogg', 75) if(user) log_game("[user] triggered a fire alarm at [COORD(src)]") diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 3a43c5783ad6..73cd38e2209b 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -578,7 +578,7 @@ /obj/structure/table/optable name = "operating table" desc = "Used for advanced medical procedures." - icon = 'goon/icons/obj/surgery.dmi' + icon = 'icons/obj/surgery_table.dmi' icon_state = "table1" buildstack = /obj/item/stack/sheet/mineral/silver smoothing_flags = NONE diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index b9f2ee96ffda..db65e0cbd688 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -615,7 +615,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) cost = 25 power_type = /datum/action/innate/ai/break_fire_alarms unlock_text = "You replace the thermal sensing capabilities of all fire alarms with a manual override, allowing you to turn them off at will." - unlock_sound = 'goon/sound/machinery/firealarm.ogg' + unlock_sound = 'sound/machines/firealarm.ogg' /datum/action/innate/ai/break_fire_alarms name = "Override Thermal Sensors" diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 3a2030c9dd50..cc9e94b91567 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -940,7 +940,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27) /obj/machinery/airalarm/proc/handle_decomp_alarm() if(!COOLDOWN_FINISHED(src, decomp_alarm)) return - playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75) + playsound(loc, 'sound/machines/FireAlarm.ogg', 75) COOLDOWN_START(src, decomp_alarm, 1 SECONDS) #undef AALARM_MODE_SCRUBBING diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index bd1322a96167..a2ea84f03777 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -9,7 +9,7 @@ maturation = 8 potency = 20 growthstages = 1 - growing_icon = 'goon/icons/obj/hydroponics.dmi' + growing_icon = 'icons/obj/hydroponics/growing.dmi' icon_grow = "cannabis-grow" // Uses one growth icons set for all the subtypes icon_dead = "cannabis-dead" // Same for the dead icon genes = list(/datum/plant_gene/trait/repeated_harvest) @@ -82,7 +82,7 @@ /obj/item/reagent_containers/food/snacks/grown/cannabis seed = /obj/item/seeds/cannabis - icon = 'goon/icons/obj/hydroponics.dmi' + icon = 'icons/obj/hydroponics/harvest.dmi' name = "cannabis leaf" desc = "Recently legalized in most galaxies." icon_state = "cannabis" diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index f520fb009ba8..ab1a5c16c7cd 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -219,7 +219,7 @@ GLOBAL_LIST_EMPTY(alldepartments) //Prevents copypasta for evil faxes /obj/machinery/photocopier/faxmachine/proc/handle_animation() flick(print_anim, src) - playsound(loc, 'goon/sound/machinery/printer_dotmatrix.ogg', 50, 1) + playsound(loc, 'sound/machines/printer.ogg', 50, 1) /obj/machinery/photocopier/faxmachine/proc/handle_copying(obj/item/incoming) use_power(active_power_usage) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index c25a2fdb82b0..a50337982ba7 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -4,7 +4,7 @@ /obj/machinery/power/solar name = "solar panel" desc = "A solar panel. Generates electricity when in contact with sunlight." - icon = 'goon/icons/obj/power.dmi' + icon = 'icons/obj/machines/oldsolars.dmi' icon_state = "sp_base" density = TRUE use_power = NO_POWER_USE @@ -227,7 +227,7 @@ /obj/item/solar_assembly name = "solar panel assembly" desc = "A solar panel assembly kit, allows constructions of a solar panel, or with a tracking circuit board, a solar tracker." - icon = 'goon/icons/obj/power.dmi' + icon = 'icons/obj/machines/oldsolars.dmi' icon_state = "sp_base" item_state = "electropack" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 6e636cd53d88..4b3f9b760fd6 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -6,7 +6,7 @@ /obj/machinery/power/tracker name = "solar tracker" desc = "A solar directional tracker." - icon = 'goon/icons/obj/power.dmi' + icon = 'icons/obj/machines/oldsolars.dmi' icon_state = "tracker" density = TRUE use_power = NO_POWER_USE diff --git a/code/modules/unit_tests/plantgrowth_tests.dm b/code/modules/unit_tests/plantgrowth_tests.dm index 6b40236860ef..15c56a12ec1d 100644 --- a/code/modules/unit_tests/plantgrowth_tests.dm +++ b/code/modules/unit_tests/plantgrowth_tests.dm @@ -8,7 +8,6 @@ states |= icon_states('icons/obj/hydroponics/growing_flowers.dmi') states |= icon_states('icons/obj/hydroponics/growing_mushrooms.dmi') states |= icon_states('icons/obj/hydroponics/growing_vegetables.dmi') - states |= icon_states('goon/icons/obj/hydroponics.dmi') var/list/paths = subtypesof(/obj/item/seeds) - /obj/item/seeds - typesof(/obj/item/seeds/sample) - /obj/item/seeds/lavaland for(var/seedpath in paths) diff --git a/goon/LICENSE.md b/goon/LICENSE.md deleted file mode 100644 index 5bda1d84f9b7..000000000000 --- a/goon/LICENSE.md +++ /dev/null @@ -1,4 +0,0 @@ -This work is licensed under the Creative Commons -Attribution-NonCommercial-ShareAlike 3.0 United States License. To view a copy -of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/us/ or -send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA. diff --git a/goon/README.md b/goon/README.md deleted file mode 100644 index cae34de90841..000000000000 --- a/goon/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Goon-ported-assets - -All files excluding this one you're reading right now have been most likely, taken from [goonstation's 2016 release](https://github.com/goonstation/goonstation-2016), unless stated otherwise. -It is very likely that there are modifications to be compatible or on par with our code, however. These changes are licensed under the same license as the other goon files. - -## License - -See LICENSE.md diff --git a/goon/icons/obj/hydroponics.dmi b/goon/icons/obj/hydroponics.dmi deleted file mode 100644 index 5fb5d4ed8dda..000000000000 Binary files a/goon/icons/obj/hydroponics.dmi and /dev/null differ diff --git a/goon/icons/obj/power.dmi b/goon/icons/obj/power.dmi deleted file mode 100644 index 8c1aff125755..000000000000 Binary files a/goon/icons/obj/power.dmi and /dev/null differ diff --git a/goon/icons/obj/surgery.dmi b/goon/icons/obj/surgery.dmi deleted file mode 100644 index c836fc16b152..000000000000 Binary files a/goon/icons/obj/surgery.dmi and /dev/null differ diff --git a/goon/sound/machinery/FireAlarm.ogg b/goon/sound/machinery/FireAlarm.ogg deleted file mode 100644 index f1a672326551..000000000000 Binary files a/goon/sound/machinery/FireAlarm.ogg and /dev/null differ diff --git a/goon/sound/machinery/printer_dotmatrix.ogg b/goon/sound/machinery/printer_dotmatrix.ogg deleted file mode 100644 index 272a2dab226d..000000000000 Binary files a/goon/sound/machinery/printer_dotmatrix.ogg and /dev/null differ diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi index e7b0942301de..2d8aecc78695 100644 Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 5959fec80530..aeae4b17a44e 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/machines/oldsolars.dmi b/icons/obj/machines/oldsolars.dmi new file mode 100644 index 000000000000..6bf300b6718e Binary files /dev/null and b/icons/obj/machines/oldsolars.dmi differ diff --git a/icons/obj/surgery_table.dmi b/icons/obj/surgery_table.dmi new file mode 100644 index 000000000000..443e81973e78 Binary files /dev/null and b/icons/obj/surgery_table.dmi differ diff --git a/shiptest.dme b/shiptest.dme index f4ed28d5950f..e86bdbceb8c1 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1035,11 +1035,11 @@ #include "code\game\objects\effects\anomalies\anomalies_gravity.dm" #include "code\game\objects\effects\anomalies\anomalies_hallucination.dm" #include "code\game\objects\effects\anomalies\anomalies_heartbeat.dm" +#include "code\game\objects\effects\anomalies\anomalies_melter.dm" #include "code\game\objects\effects\anomalies\anomalies_phantom.dm" #include "code\game\objects\effects\anomalies\anomalies_plasmasoul.dm" -#include "code\game\objects\effects\anomalies\anomalies_pyroclastic.dm" -#include "code\game\objects\effects\anomalies\anomalies_melter.dm" #include "code\game\objects\effects\anomalies\anomalies_pulsar.dm" +#include "code\game\objects\effects\anomalies\anomalies_pyroclastic.dm" #include "code\game\objects\effects\anomalies\anomalies_sparkler.dm" #include "code\game\objects\effects\anomalies\anomalies_static.dm" #include "code\game\objects\effects\anomalies\anomalies_veins.dm" diff --git a/sound/machines/FireAlarm.ogg b/sound/machines/FireAlarm.ogg new file mode 100644 index 000000000000..aa651b436138 Binary files /dev/null and b/sound/machines/FireAlarm.ogg differ diff --git a/sound/machines/printer.ogg b/sound/machines/printer.ogg new file mode 100644 index 000000000000..6916a695bf57 Binary files /dev/null and b/sound/machines/printer.ogg differ