Thalpy
|
281c6e04e8
|
Hmm
|
2019-10-08 07:43:51 +01:00 |
|
kevinz000
|
76ede7a473
|
Merge pull request #9406 from Poojawa/carpet-colors
More Carpet colors and liquid carpet varients
|
2019-10-07 23:39:52 -07:00 |
|
Thalpy
|
4538c43ede
|
Oops
|
2019-10-08 07:39:41 +01:00 |
|
Thalpy
|
f7d14ebb2c
|
Damnit webedit
|
2019-10-08 07:39:19 +01:00 |
|
kevinz000
|
dcb37bfd0e
|
Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
|
2019-10-07 23:36:11 -07:00 |
|
kevinz000
|
7c94029006
|
Merge pull request #9431 from Ghommie/Ghommie-cit221
Ports "Makes the illegal tech node harder to unlock"
|
2019-10-07 23:35:18 -07:00 |
|
kevinz000
|
d3f29c4084
|
Merge pull request #9413 from Poojawa/sprays-obey-fashion
Makes Medsprays align with patches
|
2019-10-07 23:32:48 -07:00 |
|
Thalpy
|
564c1fde9f
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-08 07:31:03 +01:00 |
|
kevinz000
|
0073d99a22
|
Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
|
2019-10-07 23:29:19 -07:00 |
|
nik707
|
de117afd8b
|
Merge pull request #9410 from Poojawa/cryopod-tweaks
Fixes Cryopod quirks, makes the menu not complete shit
|
2019-10-07 18:24:38 -05:00 |
|
nik707
|
6803338df2
|
Merge pull request #9384 from jakeramsay007/Moar-Bugfixes
Fixes the Trek uniform/suit sprites
|
2019-10-07 18:19:59 -05:00 |
|
JTGSZ
|
30a41292d8
|
left extra letter in comment
|
2019-10-07 18:02:16 -04:00 |
|
Ghommie
|
fce6f13471
|
Ports "Chat Subsystem ported from TerraGov-Marine-Corps"
|
2019-10-07 23:58:15 +02:00 |
|
JTGSZ
|
7951d87022
|
species clothing restrictions
species clothing restrictions
|
2019-10-07 17:55:16 -04:00 |
|
Linzolle
|
4bdd38b422
|
i feel like this is a really stupid way to fix it
|
2019-10-07 16:17:42 -05:00 |
|
Ghommie
|
99e9280eaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178
|
2019-10-07 21:41:04 +02:00 |
|
Ghommie
|
159d2a188d
|
peeve.
|
2019-10-07 17:38:36 +02:00 |
|
Poojawa
|
93ad7f1066
|
Corrects a missing tail state
|
2019-10-07 04:30:23 -05:00 |
|
Putnam
|
caf9bc56da
|
Make replacement update icon
|
2019-10-07 01:34:22 -07:00 |
|
Putnam
|
b452de12ff
|
Made PanD.E.M.I.C beaker stuff more like ChemMaster
|
2019-10-07 01:23:17 -07:00 |
|
kevinz000
|
dd46509597
|
Merge pull request #9377 from Thalpy/Fixes_melting_grenades
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
|
2019-10-06 21:37:50 -07:00 |
|
Ghommie
|
8228e52f43
|
Ports "Makes the illegal tech node harder to unlock"
|
2019-10-07 06:19:48 +02:00 |
|
Ghommie
|
7dfd6005d9
|
I hate nerfing things :(
|
2019-10-06 19:24:31 +02:00 |
|
Ghommie
|
a1a3bbe99f
|
Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones")
|
2019-10-06 19:16:13 +02:00 |
|
Ghommie
|
a9e30720ec
|
key, ckey, key, ckey
|
2019-10-06 18:40:24 +02:00 |
|
Fermi
|
ea031d6d40
|
Slowly getting there
|
2019-10-06 11:09:54 +01:00 |
|
Ghommie
|
f01f00710f
|
Porting some spraycan fixes.
|
2019-10-06 05:30:16 +02:00 |
|
Fermi
|
d023d58b2c
|
Changes
|
2019-10-06 02:10:46 +01:00 |
|
Fermi
|
63647b58ba
|
Merge branch 'Spookytime' of https://github.com/Thalpy/Citadel-Station-13 into Spookytime
|
2019-10-06 00:37:01 +01:00 |
|
Fermi
|
aff7f808ec
|
oops
|
2019-10-06 00:36:57 +01:00 |
|
Thalpy
|
3f21c0af5b
|
Text
|
2019-10-06 00:32:42 +01:00 |
|
Thalpy
|
27c2c89766
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-05 23:43:19 +01:00 |
|
Ghommie
|
cac4157894
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-05 22:03:37 +02:00 |
|
Ghommie
|
32a73b24c0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-10-05 18:22:43 +02:00 |
|
kevinz000
|
4fd31bce32
|
Merge pull request #9382 from jakeramsay007/Cyborg-chair-unbuckling
Borgs are now capable of unbuckling people from chairs, beds and themselves
|
2019-10-05 08:27:00 -07:00 |
|
kevinz000
|
356755d710
|
Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
|
2019-10-05 08:26:40 -07:00 |
|
kevinz000
|
22f9c9f711
|
Merge pull request #9401 from Poojawa/patch-2
APC UI autoupdates properly
|
2019-10-05 08:23:22 -07:00 |
|
kevinz000
|
a923ea984a
|
Merge pull request #9388 from Sishen1542/dynamicadminfix
Dynamic now auto-deadmin friendly
|
2019-10-05 08:22:47 -07:00 |
|
kevinz000
|
b691da0bca
|
Merge pull request #9407 from Poojawa/cryo-qol
Adds Cryo QoL with hotkeys
|
2019-10-05 08:22:01 -07:00 |
|
Ghommie
|
e31c441b3d
|
rogue tabbing
|
2019-10-05 07:52:52 +02:00 |
|
Ghommie
|
367789fda4
|
yes
|
2019-10-05 07:16:17 +02:00 |
|
Ghommie
|
3d22f4ec60
|
Porting a load of disease/symptoms code updates.
|
2019-10-05 07:14:25 +02:00 |
|
Ghommie
|
52fb4b03ac
|
we are only keeping track of the number of singu beacons, var more efficient.
|
2019-10-05 05:29:57 +02:00 |
|
Ghommie
|
35a6991300
|
lone rogue parenthesis
|
2019-10-05 05:14:38 +02:00 |
|
Ghommie
|
d706944e20
|
The niche singularity beacon now also moderately buffs meteor waves.
|
2019-10-05 04:37:01 +02:00 |
|
Ghommie
|
34bef911b2
|
macro arguments
|
2019-10-05 03:49:06 +02:00 |
|
Ghommie
|
b6cc81d097
|
flooring.
|
2019-10-05 03:13:51 +02:00 |
|
Ghommie
|
e4705ae5c0
|
Actually... let's do some scaling.
|
2019-10-05 02:57:50 +02:00 |
|
Ghommie
|
2b8fe43ef1
|
Removes the minimum player cap for the war ops.
|
2019-10-05 02:31:02 +02:00 |
|
Poojawa
|
9f88a72142
|
Makes Medsprays align with patches
Also ensures you can't spray it on ghosts, ai eyes, etc.
|
2019-10-04 16:06:07 -05:00 |
|