Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small nerfs #104

Merged
merged 10 commits into from
Nov 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions jollystation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4033,6 +4033,7 @@
#include "jollystation_modules\code\game\objects\items\other_loadout_items\loadout_inhand_items.dm"
#include "jollystation_modules\code\game\objects\items\other_loadout_items\loadout_pocket_items.dm"
#include "jollystation_modules\code\game\objects\items\storage\boxes.dm"
#include "jollystation_modules\code\game\objects\items\storage\storage.dm"
#include "jollystation_modules\code\game\objects\structures\fluff.dm"
#include "jollystation_modules\code\game\objects\structures\static_plaques.dm"
#include "jollystation_modules\code\game\objects\structures\crate_lockers\crates.dm"
Expand Down Expand Up @@ -4080,6 +4081,7 @@
#include "jollystation_modules\code\modules\clothing\head\loadout_helmet.dm"
#include "jollystation_modules\code\modules\clothing\neck\coconut_bra.dm"
#include "jollystation_modules\code\modules\clothing\shoes\loadout_shoes.dm"
#include "jollystation_modules\code\modules\clothing\spacesuits\hardsuit.dm"
#include "jollystation_modules\code\modules\clothing\suits\armor.dm"
#include "jollystation_modules\code\modules\clothing\suits\duck_tube.dm"
#include "jollystation_modules\code\modules\clothing\suits\grass_skirt.dm"
Expand Down Expand Up @@ -4171,6 +4173,7 @@
#include "jollystation_modules\code\modules\mob\living\carbon\human\species_types\species.dm"
#include "jollystation_modules\code\modules\mob\living\carbon\human\species_types\synths.dm"
#include "jollystation_modules\code\modules\mob\living\silicon\silicon.dm"
#include "jollystation_modules\code\modules\mob\living\simple_animal\corpse.dm"
#include "jollystation_modules\code\modules\mob\living\simple_animal\simple_animal.dm"
#include "jollystation_modules\code\modules\mob\living\simple_animal\bot\bot.dm"
#include "jollystation_modules\code\modules\mob\living\simple_animal\friendly\dog.dm"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//Nerf for smuggler satchels
/obj/item/storage/backpack/satchel/flat
w_class = WEIGHT_CLASS_BULKY //ok fuck this goddamn code for this shit
28 changes: 28 additions & 0 deletions jollystation_modules/code/modules/clothing/spacesuits/hardsuit.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//Clown Op ""fake"" hard suit
/obj/item/clothing/suit/space/hardsuit/clownop
name = "a silly blood-red hardsuit"
desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in EVA mode. Property of Gorlex Marauders."
alt_desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in combat mode. Property of Gorlex Marauders."
icon_state = "hardsuit1-syndi"
inhand_icon_state = "syndie_hardsuit"
hardsuit_type = "syndi"
w_class = WEIGHT_CLASS_BULKY
armor = list(MELEE = 10, BULLET = 10, LASER = 0, ENERGY = 0, BOMB = 5, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, WOUND = 0)
allowed = list(/obj/item/grown/bananapeel, /obj/item/food/grown/banana)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/clownop
cell = /obj/item/stock_parts/cell/high

//Helmet for the ""hard suit""
/obj/item/clothing/head/helmet/space/hardsuit/clownop
name = "a silly blood-red hardsuit helmet"
desc = "A dual-mode advanced helmet designed for work in special operations. It is in EVA mode. Property of Gorlex Marauders."
alt_desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders."
icon_state = "hardsuit1-syndi"
inhand_icon_state = "syndie_helm"
hardsuit_type = "syndi"
armor = list(MELEE = 5, BULLET = 5, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0, WOUND = 0)
on = TRUE
var/obj/item/clothing/suit/space/hardsuit/clownop/linkedsuit = null
actions_types = list(/datum/action/item_action/toggle_helmet_mode)
visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
visor_flags = STOPSPRESSUREDAMAGE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//Changes some of the legion commander clothing
/datum/outfit/syndicatecommandocorpse
name = "Syndicate Commando Corpse"
suit = /obj/item/clothing/suit/armor/vest
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/color/black
back = /obj/item/storage/backpack/duffelbag
id = /obj/item/card/id
id_trim = /datum/id_trim/chameleon/operative

//Clown Op corpse. Honk!
/datum/outfit/clownop
name = "A Funny Operative"
suit = /obj/item/clothing/suit/space/hardsuit/clownop
shoes = /obj/item/clothing/shoes/clown_shoes
gloves = /obj/item/clothing/gloves/color/green
back = /obj/item/storage/backpack/clown
uniform = /obj/item/clothing/under/rank/civilian/clown
mask = /obj/item/clothing/mask/gas/clown_hat