Skip to content

Commit

Permalink
Kills Goonstation (shiptest-ss13#2122)
Browse files Browse the repository at this point in the history
<!-- 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. -->
  • Loading branch information
Sun-Soaked authored Jul 5, 2023
1 parent f26bb33 commit ec8bcd1
Show file tree
Hide file tree
Showing 24 changed files with 12 additions and 27 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion code/game/machinery/firealarm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)]")

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/tables_racks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/traitor/equipment/Malf_Modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "<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>"
unlock_sound = 'goon/sound/machinery/firealarm.ogg'
unlock_sound = 'sound/machines/firealarm.ogg'

/datum/action/innate/ai/break_fire_alarms
name = "Override Thermal Sensors"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/atmospherics/machinery/airalarm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/hydroponics/grown/cannabis.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/faxmachine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/power/solar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion code/modules/power/tracker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion code/modules/unit_tests/plantgrowth_tests.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions goon/LICENSE.md

This file was deleted.

8 changes: 0 additions & 8 deletions goon/README.md

This file was deleted.

Binary file removed goon/icons/obj/hydroponics.dmi
Binary file not shown.
Binary file removed goon/icons/obj/power.dmi
Binary file not shown.
Binary file removed goon/icons/obj/surgery.dmi
Binary file not shown.
Binary file removed goon/sound/machinery/FireAlarm.ogg
Binary file not shown.
Binary file removed goon/sound/machinery/printer_dotmatrix.ogg
Binary file not shown.
Binary file modified icons/obj/hydroponics/growing.dmi
Binary file not shown.
Binary file modified icons/obj/hydroponics/harvest.dmi
Binary file not shown.
Binary file added icons/obj/machines/oldsolars.dmi
Binary file not shown.
Binary file added icons/obj/surgery_table.dmi
Binary file not shown.
4 changes: 2 additions & 2 deletions shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file added sound/machines/FireAlarm.ogg
Binary file not shown.
Binary file added sound/machines/printer.ogg
Binary file not shown.

0 comments on commit ec8bcd1

Please sign in to comment.