3928e027b4
Fixes (see dev discussion)
2019-06-25 23:06:55 +01:00
5f99d9ec04
Fixes wrong item path for donator loadout
2019-06-25 09:50:35 -05:00
e84fd8942f
fix
2019-06-25 03:08:40 -04:00
52f100998c
Update custom_items.dm
2019-06-25 02:59:49 -04:00
eb2dc63a54
Oh nooooo I forgot to save!!!
2019-06-25 07:50:44 +01:00
4145b0f256
Hotfix for egregious oversights.
2019-06-25 07:22:20 +01:00
50aede119b
all works
2019-06-25 01:50:35 -04:00
67f00fc049
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42
2019-06-24 16:48:15 +02:00
8605d3a246
Found a pH overflow.
2019-06-24 15:06:18 +01:00
b485d8e750
Saves jay the trouble
...
Im a good cat
2019-06-24 02:21:04 -04:00
69d48c5e5e
Merge pull request #8736 from Trilbyspaceclone/Poojawa_How_Do_I_Update_My_Shit
...
Removes Nudity Permits and replaces them with invisible gear harnesses
2019-06-23 17:26:30 -07:00
26cd24a79d
Tweaked reagent colours.
2019-06-23 20:33:07 +01:00
fdba8c000f
Fixing compiling errors.
2019-06-23 20:03:37 +01:00
10109d0fe5
Merge branch 'pr/18'
2019-06-23 19:15:07 +01:00
dcab96d9d5
Merge pull request #8721 from Ghommie/Ghommie-cit77
...
Ports in "Liver removal/failure now also stops passive reagent effects"
2019-06-23 06:53:30 -07:00
df70e135bd
Merge pull request #8711 from Ghommie/Ghommie-cit75
...
Greytide Stationwide!
2019-06-23 06:52:05 -07:00
41bd3caf3c
Ports "Reorganizes the uplink, adds grenades and explosives category." ( #8669 )
...
* Ports "Reorganizes the uplink, adds grenades and explosives category."
* Unbent codex, singing the sorrow of aborted spoils.
* .
2019-06-23 06:00:27 -07:00
2bb56a900a
Dab emote now checks restraint flags. ( #8672 )
...
* Update cit_emotes.dm
* Revert "Update cit_emotes.dm"
This reverts commit 649007667db6f7d1fdd0f30e99bbaa268fbeb03c.
* Revert "Revert "Update cit_emotes.dm""
This reverts commit 7950f642bf32b4179d265fdb498451c3e05a10fe.
2019-06-23 06:00:07 -07:00
4278284e7b
Merge branch 'master' into Poojawa_How_Do_I_Update_My_Shit
2019-06-23 01:52:59 -04:00
7f4d60ae25
Poojawa this would been easyer with webedits
2019-06-23 01:49:45 -04:00
537161dd01
Lil flavour tweaks.
2019-06-23 03:22:54 +01:00
21c17813b8
Guess who should've compile tested!
2019-06-23 01:20:11 +01:00
138535f9f6
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines.
2019-06-22 23:15:51 +02:00
59b6d85c4e
Few phrasing and span editing fixes.
2019-06-22 21:59:20 +01:00
f096e8440a
Finally fixed the vocalchord button
2019-06-22 21:00:20 +01:00
45109776e1
Ports in "Liver removal/failure now also stops passive reagent effects"
2019-06-22 17:05:08 +02:00
226dbe7804
Fixed blank sprite for velvet chord organ
2019-06-22 13:09:18 +01:00
d2685be3f6
Split custom echo code into it's own call to reduce overhead.
2019-06-22 12:18:38 +01:00
88dd4bdc99
Brings back Big Wolf ears for humans ( #8668 )
...
* Brings back Big Wolf ears for humans
This use to be here, and I'm no furry, but it needed to come back.
* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
* Update modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-06-21 19:32:21 -07:00
69a302d4f4
Greytide Stationwide!
2019-06-22 00:03:28 +02:00
7a3542fc5c
Double messages.
2019-06-20 02:49:30 +01:00
1cefd6fca7
Added a few more comments for reviewers as I was reviewing myself.
2019-06-19 23:04:08 +01:00
713d849c03
Merge remote-tracking branch 'upstream/master'
2019-06-19 21:02:30 +01:00
38ed75dc68
Reverts sneaky pandas
2019-06-18 22:48:34 +01:00
345acdc94e
I just can't wait to be king
2019-06-18 19:38:08 +01:00
ade3a4bced
Fixes.
2019-06-18 19:06:26 +01:00
68a4e3fc06
Lil tweaks.
2019-06-18 13:38:00 +01:00
5436014e19
Swaped split state to holo.
2019-06-18 13:16:37 +01:00
afeb1d8870
Preholo
2019-06-18 12:49:22 +01:00
cbea384175
Merge remote-tracking branch 'origin/master' into sprint_stamina
2019-06-17 11:39:03 -07:00
bf991cd2da
Underwear overlays Gentials, can toggle each seperately ( #8602 )
...
* Gentials layered under underclothes
* screm
2019-06-17 11:20:25 -07:00
4526832e7d
I'm spending too much time trying to fix something rejected.
2019-06-17 15:16:45 +01:00
d092dd1da0
Testing hypnoquirk
2019-06-17 12:47:23 +01:00
41eee65b15
Merge branch 'master' into master
2019-06-17 12:18:40 +01:00
d5279c8373
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-06-17 09:51:22 +02:00
3527664c40
Merge branch 'master' into sprint_stamina
2019-06-16 19:55:56 -07:00
6c54c21d9c
Merge pull request #8653 from Citadel-Station-13/commjacket
...
Donator Comm Jacket - [Ready]
2019-06-16 19:54:24 -07:00
92e0d7c20b
Update custom_items.dm
2019-06-16 20:54:27 -05:00
6b903893b2
Update __donator.dm
2019-06-16 20:54:02 -05:00
4614235f75
Comments.
2019-06-16 13:34:38 +01:00
Fermi