Skip to content

Commit

Permalink
Removes some old cruft (#2190)
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 some cruft we don't care about
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
cruft
<!-- 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:
del: Drip outfit is removed for being too crusty
del: Sec hailer sounds are gone
/: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
thgvr authored Jul 24, 2023
1 parent 6825730 commit 071a238
Show file tree
Hide file tree
Showing 35 changed files with 13 additions and 321 deletions.
2 changes: 0 additions & 2 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -936,8 +936,6 @@
/obj/effect/turf_decal/corner/opaque/blue/borderfull,
/obj/item/circuitboard/machine/vending,
/obj/item/vending_refill/autodrobe,
/obj/item/clothing/shoes/drip,
/obj/item/clothing/under/drip,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
"dG" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/shiptest/independent_nemo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2023,7 +2023,6 @@
/area/ship/engineering/atmospherics)
"CN" = (
/obj/structure/table/wood,
/obj/item/clothing/under/drip,
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood,
/area/ship/crew/dorm)
Expand Down
3 changes: 1 addition & 2 deletions _maps/shuttles/shiptest/independent_rube_goldberg.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2154,7 +2154,6 @@
/turf/open/floor/engine/airless,
/area/ship/engineering/atmospherics)
"vW" = (
/obj/item/storage/backpack/satchel/flat/with_drip,
/turf/open/floor/engine/airless,
/area/ship/engineering/engine)
"vX" = (
Expand Down Expand Up @@ -3617,7 +3616,7 @@
/obj/structure/toilet/secret{
dir = 8;
pixel_x = 7;
secret_type = "/obj/item/clothing/shoes/drip"
secret_type = "/obj/item/toy/plush/blahaj"
},
/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/plasteel/white,
Expand Down
3 changes: 0 additions & 3 deletions code/datums/action.dm
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,6 @@
name = "Toggle [target.name]"
button.name = name

/datum/action/item_action/halt
name = "HALT!"

/datum/action/item_action/toggle_voice_box
name = "Toggle Voice Box"

Expand Down
79 changes: 0 additions & 79 deletions code/datums/hailer_phrase.dm

This file was deleted.

16 changes: 2 additions & 14 deletions code/datums/mood_events/generic_positive_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -175,18 +175,6 @@
description = "<span class='nicegreen'>What a peculiar emblem. It makes me feel hopeful for my future.</span>\n"
mood_change = 5

/datum/mood_event/drippy
description = "<span class='nicegreen'>My self confidence, unstopping. My style, unbreakable.</span>\n"
mood_change = 5

/datum/mood_event/dripjordan
description = "<span class='nicegreen'>These shoes make me feel like I could really push myself to victory!</span>\n"
mood_change = 5

/datum/mood_event/nojordans
description = "<span class='warning'>They're gone... my fashion is ruined. I can feel my self esteem decaying... </span>\n"
mood_change = -10

/datum/mood_event/nanite_happiness
description = "<span class='nicegreen robot'>+++++++HAPPINESS ENHANCEMENT+++++++</span>\n"
mood_change = 7
Expand All @@ -206,10 +194,10 @@
description = "<span class='nicegreen'>I'm feeling confident with a head full of hair.</span>\n"
mood_change = 2

/datum/mood_event/dkickflip //WS Edit Begin - Skateboards can take you to the afterlife
/datum/mood_event/dkickflip
description = "<span class='nicegreen'>I just witnessed the most RAD thing ever.</span>\n"
mood_change = 5
timeout = 2 MINUTES //WS Edit End
timeout = 2 MINUTES

/datum/mood_event/high_five
description = "<span class='nicegreen'>I love getting high fives!</span>\n"
Expand Down
3 changes: 0 additions & 3 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,6 @@
var/ctype = pick(contraband)
new ctype(src)

/obj/item/storage/backpack/satchel/flat/with_drip/PopulateContents()
new /obj/item/clothing/under/drip(src)

/obj/item/storage/backpack/satchel/flat/with_tools/PopulateContents()
new /obj/item/stack/tile/plasteel(src)
new /obj/item/crowbar(src)
Expand Down
1 change: 0 additions & 1 deletion code/game/objects/items/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,6 @@
name = "Security Officer action figure"
icon_state = "secofficer"
toysay = "I am the law!"
toysound = 'sound/runtime/complionator/dredd.ogg'

/obj/item/toy/figure/virologist
name = "Virologist action figure"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/cargo/exports/lavaland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
/obj/item/freeze_cube,
/obj/item/clothing/gloves/gauntlets,
/obj/item/necromantic_stone/lava,
/obj/item/clothing/under/drip,
/obj/item/clothing/shoes/drip)
)

//Megafauna loot, except for ash drakes and legion

Expand All @@ -57,7 +56,8 @@
/obj/item/mayhem,
/obj/item/blood_contract,
/obj/item/guardiancreator/miner/choose,//this is basically the most valulable mining loot so good luck getting a miner to part ways
/obj/item/gun/magic/staff/spellblade)
/obj/item/gun/magic/staff/spellblade,
)

/datum/export/lavaland/trophycommon
cost = 1500
Expand Down
Loading

0 comments on commit 071a238

Please sign in to comment.