Thalpy
4b7ac0be79
More fun ssblackbox tallies.
2019-06-28 16:50:48 +01:00
Thalpy
a2a5bbdb11
Found the "the floor" message admin!
2019-06-26 19:40:46 +01:00
Fermi
afe43070a0
Improved logging and renamed buffer IDs
2019-06-26 12:20:10 +01:00
Fermi
0954f0f50c
This is why you always compile test before merging.
2019-06-26 12:07:21 +01:00
Fermi
fbf54cd560
Ninja fix.
2019-06-26 12:01:26 +01:00
Fermi
19b79b8232
The great botany purge of our time.
2019-06-26 01:29:34 +01:00
Fermi
a53ca38eb9
Lil fix
2019-06-25 23:54:23 +01:00
Fermi
e4e3932eb3
Sprites
2019-06-25 23:46:42 +01:00
Fermi
1ad92b9758
Final round of fixes from testing.
2019-06-25 23:44:04 +01:00
Fermi
1f0dec53ff
Fixed wrong chem
2019-06-25 23:13:22 +01:00
Fermi
3ccf300052
Fixed empty hypovial
2019-06-25 23:11:43 +01:00
Fermi
3928e027b4
Fixes (see dev discussion)
2019-06-25 23:06:55 +01:00
Fermi
eb2dc63a54
Oh nooooo I forgot to save!!!
2019-06-25 07:50:44 +01:00
Fermi
4145b0f256
Hotfix for egregious oversights.
2019-06-25 07:22:20 +01:00
Fermi
8605d3a246
Found a pH overflow.
2019-06-24 15:06:18 +01:00
Fermi
26cd24a79d
Tweaked reagent colours.
2019-06-23 20:33:07 +01:00
Fermi
fdba8c000f
Fixing compiling errors.
2019-06-23 20:03:37 +01:00
Fermi
10109d0fe5
Merge branch 'pr/18'
2019-06-23 19:15:07 +01:00
kevinz000
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
kevinz000
df70e135bd
Merge pull request #8711 from Ghommie/Ghommie-cit75
...
Greytide Stationwide!
2019-06-23 06:52:05 -07:00
Ghom
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
Sishen1542
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
Fermi
537161dd01
Lil flavour tweaks.
2019-06-23 03:22:54 +01:00
Fermi
21c17813b8
Guess who should've compile tested!
2019-06-23 01:20:11 +01:00
Fermi
59b6d85c4e
Few phrasing and span editing fixes.
2019-06-22 21:59:20 +01:00
Fermi
f096e8440a
Finally fixed the vocalchord button
2019-06-22 21:00:20 +01:00
Ghommie
45109776e1
Ports in "Liver removal/failure now also stops passive reagent effects"
2019-06-22 17:05:08 +02:00
Fermi
226dbe7804
Fixed blank sprite for velvet chord organ
2019-06-22 13:09:18 +01:00
Fermi
d2685be3f6
Split custom echo code into it's own call to reduce overhead.
2019-06-22 12:18:38 +01:00
poptar4551
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
Ghommie
69a302d4f4
Greytide Stationwide!
2019-06-22 00:03:28 +02:00
Fermi
7a3542fc5c
Double messages.
2019-06-20 02:49:30 +01:00
Fermi
1cefd6fca7
Added a few more comments for reviewers as I was reviewing myself.
2019-06-19 23:04:08 +01:00
Fermi
713d849c03
Merge remote-tracking branch 'upstream/master'
2019-06-19 21:02:30 +01:00
Fermi
38ed75dc68
Reverts sneaky pandas
2019-06-18 22:48:34 +01:00
Fermi
345acdc94e
I just can't wait to be king
2019-06-18 19:38:08 +01:00
Fermi
ade3a4bced
Fixes.
2019-06-18 19:06:26 +01:00
Fermi
68a4e3fc06
Lil tweaks.
2019-06-18 13:38:00 +01:00
Fermi
5436014e19
Swaped split state to holo.
2019-06-18 13:16:37 +01:00
Fermi
afeb1d8870
Preholo
2019-06-18 12:49:22 +01:00
Poojawa
bf991cd2da
Underwear overlays Gentials, can toggle each seperately ( #8602 )
...
* Gentials layered under underclothes
* screm
2019-06-17 11:20:25 -07:00
Fermi
4526832e7d
I'm spending too much time trying to fix something rejected.
2019-06-17 15:16:45 +01:00
Fermi
d092dd1da0
Testing hypnoquirk
2019-06-17 12:47:23 +01:00
Thalpy
41eee65b15
Merge branch 'master' into master
2019-06-17 12:18:40 +01:00
kevinz000
6c54c21d9c
Merge pull request #8653 from Citadel-Station-13/commjacket
...
Donator Comm Jacket - [Ready]
2019-06-16 19:54:24 -07:00
LetterJay
92e0d7c20b
Update custom_items.dm
2019-06-16 20:54:27 -05:00
LetterJay
6b903893b2
Update __donator.dm
2019-06-16 20:54:02 -05:00
Fermi
4614235f75
Comments.
2019-06-16 13:34:38 +01:00
Fermi
c2b9c0321d
Catfix
2019-06-16 13:33:41 +01:00
Fermi
2df7e208b5
Spellchecking.
2019-06-16 12:34:37 +01:00
