Commit Graph

11709 Commits

Author SHA1 Message Date
kevinz000
eff86a449f wew 2020-01-14 16:45:22 -07:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000
e1ae3f3c07 Merge pull request #10492 from Trilbyspaceclone/plastic__world
Plastic snow
2020-01-12 00:49:39 -08:00
kevinz000
60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates
Massive RCD Port & Updates
2020-01-12 00:45:21 -08:00
kevinz000
0b56e76b29 Merge pull request #10504 from Xantholne/xantholne-bees02
Bees
2020-01-12 00:42:19 -08:00
kevinz000
6396c95bec Merge pull request #10480 from Putnam3145/more_flavor
Added second flavor text, not copied anywhere.
2020-01-12 00:41:47 -08:00
kevinz000
fe720dbb9c Merge pull request #10500 from rossark/robo
ports fast augmentation surgery pr from /tg/
2020-01-12 00:41:30 -08:00
Putnam3145
01db064038 Merge pull request #10532 from Ghommie/Ghommie-cit503
A few reagents related fixes.
2020-01-12 00:41:00 -08:00
kevinz000
c69d882943 Merge pull request #10521 from BlackMajor/master
Fixes roundstart borg spawns, plus a little bit extra.
2020-01-12 00:40:48 -08:00
kevinz000
4b4864740b Merge pull request #10522 from Hatterhat/syndi-sleeper
printable syndicate sleepers - this is blackmajors fault im not gonna lie
2020-01-12 00:40:17 -08:00
kevinz000
ddff903532 Merge pull request #10518 from Seris02/explosionport
ports the explosion rework thingamajig
2020-01-12 00:38:43 -08:00
kevinz000
68d02de239 Merge pull request #10516 from BonniePandora/Proc-call-shit
Allows calling procs in SDQL update queries without storing the return anywhere
2020-01-12 00:37:12 -08:00
kevinz000
f5995cfaaa this is a massive security risk 2020-01-12 00:36:52 -08:00
Lin
d6b28c59d4 Merge pull request #10509 from Ghommie/Ghommie-cit502
Fixes reagent containers examine.
2020-01-11 22:16:27 +00:00
Ghommie
16db38a08f Travis man good 2020-01-11 20:51:15 +01:00
Ghommie
c709a9e4a9 A few reagents related fixes. 2020-01-11 18:45:54 +01:00
kevinz000
af562d1421 Update bloodsucker_life.dm 2020-01-11 06:54:29 -08:00
Ghom
34502cab1d Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
Ghom
7fa3289013 Merge pull request #10497 from Trilbyspaceclone/uplink_redo
Cleans up uplink_items into each folder
2020-01-11 15:28:04 +01:00
Ghom
894abc67c0 Merge pull request #10502 from Linzolle/big-boss
[s] i'm trying to sneak around
2020-01-11 15:24:21 +01:00
Ghom
3a72d1f434 Merge pull request #10495 from Citadel-Station-13/kevinz000-patch-12
allow guests to use looc
2020-01-11 15:09:37 +01:00
Ghom
e851939281 Merge pull request #10523 from Hatterhat/fuck-you-baltimore
you can finally put armor plating on your standard explorer suit hood again
2020-01-11 15:06:20 +01:00
Hatterhat
2006ccf4ef nicc you buffoon you never adjusted the hood type 2020-01-11 00:12:52 -06:00
Hatterhat
b5f8e46941 this is blackmajors fault im not gonna lie 2020-01-10 23:41:30 -06:00
BlackMajor
30fc5b560b Couple of lingering fixes 2020-01-11 17:57:18 +13:00
Seris02
29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
Seris02
0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
BonniePandora
bb26f21c71 I have no idea what I'm doing to be quite honest 2020-01-11 02:43:58 +00:00
Lin
42263a435a Merge pull request #10489 from Seris02/chameleonthing
Fixes and improvements for chameleon clothes
2020-01-11 01:12:43 +00:00
Lin
fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
Lin
cd8e83e7c0 Merge pull request #10486 from Seris02/observe
moves observe to ghost tab instead of sticking it in the ooc tab
2020-01-10 23:56:46 +00:00
kevinz000
8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
2020-01-10 14:01:06 -08:00
Ghommie
c9375a1288 Fixes reagent containers examination. 2020-01-10 14:19:22 +01:00
Linzolle
dc0fdebc21 hrmngh colonel 2020-01-09 22:46:43 -06:00
Linzolle
8d70181ecf uh oh stinky 2020-01-09 22:41:50 -06:00
rosko
e1f524fc03 ports fast augmentation pr from /tg/
https://github.com/tgstation/tgstation/pull/47721
2020-01-10 03:53:27 +02:00
Trilbyspaceclone
d463ba8edd Update others.dm 2020-01-09 20:43:31 -05:00
Trilbyspaceclone
7df495f4ba Merge branch 'master' into plastic__world 2020-01-09 20:41:33 -05:00
Lin
e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Lin
ee5d6a3d4a Merge pull request #10449 from Ghommie/Ghommie-cit498
Improves the set_APTFT verb into a proc.
2020-01-10 00:38:06 +00:00
Unknown
e008388176 Bee models 2020-01-09 16:13:23 -07:00
Trilbyspaceclone
05d86b7072 Update uplink_items.dm 2020-01-09 16:03:27 -05:00
Trilbyspaceclone
9ba5f35398 Update uplink_items.dm 2020-01-09 16:02:53 -05:00
TrilbySpaceClone
74d881388e so much cleaner 2020-01-09 15:42:09 -05:00
r4d6
581654f13f Add RPD to research 2020-01-09 13:55:31 -05:00
Unknown
753c572a5e I'm about to go into a comma 2020-01-09 11:21:00 -07:00
kevinz000
dfce4ea75f Update looc.dm 2020-01-09 09:30:49 -08:00
TrilbySpaceClone
34c6288d22 so fantastic! 2020-01-09 05:46:30 -05:00