shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pr/18'

Browse Source
This commit is contained in:
Fermi
2019-06-23 19:15:07 +01:00
parent b309490190 08b475f50d
commit 10109d0fe5
137 changed files with 5557 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/_service.dm
+6
View File
@@ -1,3 +1,9 @@
/datum/gear/greytidestationwide
name = "Grey jumpsuit"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/color/grey
restricted_roles = list("Assistant")
/datum/gear/plushvar
name = "Ratvar Plushie"
category = SLOT_IN_BACKPACK
modular_citadel/code/modules/mob/cit_emotes.dm
+1
View File
@@ -183,6 +183,7 @@
key_third_person = "suddenly hits a dab"
message = "suddenly hits a dab!"
emote_type = EMOTE_AUDIBLE
restraint_check = TRUE
modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+26
View File
@@ -191,6 +191,32 @@
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
color_src = MATRIXED
/datum/sprite_accessory/ears/human/bigwolf
name = "Big Wolf"
icon_state = "bigwolf"
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
color_src = MATRIXED
/datum/sprite_accessory/ears/human/bigwolfinner
name = "Big Wolf (ALT)"
icon_state = "bigwolfinner"
hasinner = 1
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
color_src = MATRIXED
/datum/sprite_accessory/ears/human/bigwolfdark
name = "Dark Big Wolf"
icon_state = "bigwolfdark"
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
color_src = MATRIXED
/datum/sprite_accessory/ears/human/bigwolfinnerdark
name = "Dark Big Wolf (ALT)"
icon_state = "bigwolfinnerdark"
hasinner = 1
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
color_src = MATRIXED
/datum/sprite_accessory/ears/human/cow
name = "Cow"
icon_state = "cow"
modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm
+2 -2
View File
@@ -17,13 +17,13 @@
M.adjustStaminaLoss(-5*REM)
. = ..()
/datum/reagent/syndicateadrenals/on_mob_add(mob/living/M)
/datum/reagent/syndicateadrenals/on_mob_metabolize(mob/living/M)
. = ..()
if(istype(M))
M.next_move_modifier *= 0.5
to_chat(M, "<span class='notice'>You feel an intense surge of energy rushing through your veins.</span>")
/datum/reagent/syndicateadrenals/on_mob_delete(mob/living/M)
/datum/reagent/syndicateadrenals/on_mob_end_metabolize(mob/living/M)
. = ..()
if(istype(M))
M.next_move_modifier *= 2
modular_citadel/code/modules/uplink/uplink_items.dm
-18
View File
@@ -1,18 +0,0 @@
/*
// PUT ALL YOUR NEW UPLINK STUFF HERE, OVERRIDES GO IN HERE TOO
*/
/datum/uplink_item/device_tools/emagrecharge
name = "Electromagnet Charging Device"
desc = "A small device intended for recharging Cryptographic Sequencers. Using it will add five extra charges to the Cryptographic Sequencer."
item = /obj/item/emagrecharge
cost = 2
/datum/uplink_item/dangerous/revolver
item = /obj/item/gun/ballistic/revolver/syndie
/datum/uplink_item/dangerous/phantomthief
name = "Syndicate Mask"
desc = "A cheap plastic mask fitted with an adrenaline autoinjector, which can be used by simply tensing your muscles"
item = /obj/item/clothing/glasses/phantomthief/syndicate
cost = 2