kevinz000
|
236dcc4d63
|
Merge pull request #9452 from Ghommie/Ghommie-cit225
Stops non-alphanumeric graffiti decals from being named "letter".
|
2019-10-10 02:10:08 -07:00 |
|
kevinz000
|
0c9a065096
|
Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
|
2019-10-10 02:09:37 -07:00 |
|
lolman360
|
c694cb8652
|
h
|
2019-10-09 13:35:23 +11:00 |
|
lolman360
|
645b8ddf39
|
cmo: the new CE
loot him for tools
|
2019-10-09 13:32:45 +11:00 |
|
Ghommie
|
cfccacafbf
|
Stops all graffiti decals from being named "letter".
|
2019-10-09 01:54:38 +02:00 |
|
Ghommie
|
dac6fef57a
|
Also implementing /tg/station pr #40767
|
2019-10-09 00:38:09 +02:00 |
|
Poojawa
|
d7ab97dffc
|
does some of the television's demands
|
2019-10-08 04:02:20 -05:00 |
|
lolman360
|
04521551f0
|
one commit wonder
|
2019-10-08 19:46:28 +11:00 |
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
GrayRachnid
|
9f8ad74bf9
|
New traumas and some other things.
|
2019-10-08 03:53:01 -04:00 |
|
kevinz000
|
fe1a78f413
|
Merge pull request #9421 from Ghommie/Ghommie-cit218
Porting some spraycan fixes and tweaks.
|
2019-10-08 00:34:58 -07:00 |
|
kevinz000
|
abef83f56e
|
Merge pull request #9427 from Ghommie/Ghommie-cit219
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
|
2019-10-08 00:34:33 -07:00 |
|
kevinz000
|
143e8c4186
|
Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
|
2019-10-08 00:34:07 -07:00 |
|
kevinz000
|
8aacedaefa
|
Merge pull request #9316 from Thalpy/Reagents_bitflats
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
|
2019-10-08 00:33:21 -07: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 |
|
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 |
|
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 |
|
Linzolle
|
4bdd38b422
|
i feel like this is a really stupid way to fix it
|
2019-10-07 16:17:42 -05:00 |
|
Ghommie
|
159d2a188d
|
peeve.
|
2019-10-07 17:38:36 +02:00 |
|
Ghommie
|
b95f910a4e
|
macros
|
2019-10-07 17:32:16 +02:00 |
|
Ghommie
|
5232728ee7
|
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-10-07 05:25:47 +02:00 |
|
Ghommie
|
31a6979c3c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-10-06 21:54:15 +02:00 |
|
Ghommie
|
a1a3bbe99f
|
Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones")
|
2019-10-06 19:16:13 +02:00 |
|
Poojawa
|
ee5155bdbb
|
fixes oddities
|
2019-10-06 04:27:46 -05:00 |
|
Ghommie
|
f01f00710f
|
Porting some spraycan fixes.
|
2019-10-06 05:30:16 +02:00 |
|
Thalpy
|
27c2c89766
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-05 23:43:19 +01: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 |
|
Trilbyspaceclone
|
f43bd91072
|
Merge branch 'master' into A_Tailer's_art
|
2019-10-05 11:50:12 -04:00 |
|
Ghommie
|
3d22f4ec60
|
Porting a load of disease/symptoms code updates.
|
2019-10-05 07:14:25 +02:00 |
|
Poojawa
|
9d2d84f53d
|
Update table_frames.dm
|
2019-10-04 15:49:25 -05:00 |
|
Poojawa
|
6d9aa8de70
|
More carpet options and ways to get them
|
2019-10-03 22:54:10 -05:00 |
|
Poojawa
|
27b26978be
|
Quartermaster is a head of staff
Suck it, non believers.
|
2019-10-03 19:13:56 -05:00 |
|
Poojawa
|
b589565398
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-03 15:05:26 -05:00 |
|
Arturlang
|
47037c1d57
|
Instakill-man-bad
OwO
|
2019-10-03 10:54:56 +03:00 |
|
Ghommie
|
6dbac16c74
|
Sanitizing the fermis code biohazard.
|
2019-10-03 04:31:11 +02:00 |
|
Poojawa
|
0482973e8f
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 22:38:12 -05:00 |
|
Ghommie
|
81fc0c1b32
|
more foolproofing.
|
2019-10-02 00:37:02 +02:00 |
|
Ghommie
|
e635a05d16
|
errors.
|
2019-10-01 23:43:38 +02:00 |
|
Ghommie
|
d2300765b2
|
adjacency checks.
|
2019-10-01 23:16:47 +02:00 |
|
Ghommie
|
cfcd325778
|
reworking the shoving people action.
|
2019-10-01 23:13:08 +02:00 |
|
kevinz000
|
250c6ed986
|
Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
|
2019-10-01 00:12:32 -07:00 |
|
Fermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
Poojawa
|
117e5a409d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 00:05:44 -05:00 |
|
kappa-sama
|
c42d5b31a1
|
ok justin
|
2019-09-30 20:13:31 -04:00 |
|
kevinz000
|
5c8471808c
|
Update plastic.dm
|
2019-09-28 20:44:29 -07:00 |
|
Fermi
|
f83de63124
|
Kev's scanner malarky
|
2019-09-28 17:51:55 +01:00 |
|
Poojawa
|
9bd6f83034
|
Applies rad_flags to a lot of common items + bluespace bags
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
|
2019-09-28 03:22:17 -05:00 |
|
Poojawa
|
041a4b4ed1
|
Corrects scanner measurment information
|
2019-09-28 03:18:00 -05:00 |
|
kevinz000
|
0febc1977a
|
Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
|
2019-09-28 00:38:08 -07:00 |
|