Commit Graph

18069 Commits

Author SHA1 Message Date
kappa-sama
8a7e6d49a6 e 2020-01-11 12:35:49 -05:00
kappa-sama
108e585cf1 shit 2020-01-11 12:25:38 -05:00
kappa-sama
1aee5e880a god 2020-01-11 12:24:23 -05:00
kappa-sama
b6a187dc6d OOPS 2020-01-10 22:48:33 -05:00
kappa-sama
bfedc80c64 idk what this even is lmao 2020-01-10 22:39:45 -05:00
kappa-sama
3281db6000 scream 2020-01-10 22:39:13 -05:00
kappa-sama
5857da02a5 cheeki breeki 2020-01-10 22:35:30 -05:00
kappa-sama
93fc0b3716 xenos helmet 2020-01-10 22:34:26 -05:00
kappa-sama
799059071f this 2020-01-10 22:32:47 -05:00
kappa-sama
f88eefa8a9 stunsword 2020-01-10 22:30:28 -05:00
kappa-sama
e21cb4e67b shocking 2020-01-10 22:28:55 -05:00
kappa-sama
aacf4bec8b qm set 2020-01-10 22:26:48 -05:00
kappa-sama
62ebc2d226 zoom 2020-01-10 22:25:07 -05:00
kappa-sama
e5e58518e4 boomers 2020-01-10 22:22:44 -05:00
kappa-sama
412b0175b6 new file 2020-01-10 22:20:53 -05:00
kappa-sama
25422542c9 this 2020-01-10 22:19:00 -05:00
kappa-sama
2453e95eee moves this 2020-01-10 22:16:51 -05: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
Lin
147d948ad8 Merge pull request #10498 from Citadel-Station-13/kevinz000-patch-13
reduces table cooldown to 0.4
2020-01-10 23:55:07 +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
kevinz000
d4592449d2 Merge pull request #10484 from deathride58/topiccommandlimit
[s] Caches the status topic to prevent low-effort DDoSes
2020-01-10 14:00:43 -08: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
kevinz000
52a0f5779d Update tables_racks.dm 2020-01-09 15:20:57 -08:00
Unknown
753c572a5e I'm about to go into a comma 2020-01-09 11:21:00 -07:00
Seris02
3f7a0f4b7c fixes chameleon cloak icon 2020-01-09 15:07:43 +08:00
Seris02
adfb077a0a chameleon fixes 2020-01-09 15:05:46 +08:00
Unknown
62396bffb1 Clothesmate vending 2020-01-08 22:47:28 -07:00
Putnam3145
3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
Unknown
8a8d0bf6da Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:36:22 -07:00
Unknown
afc0ca44f2 Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:35:36 -07:00
deathride58
c39058379e Merge branch 'master' into topiccommandlimit 2020-01-08 22:19:56 -05:00
deathride58
0b9d566076 Merge pull request #10469 from kevinz000/fail2topic
Ports fail2topic from Aurora
2020-01-08 22:19:22 -05:00
kevinz000
356286f0e5 Merge pull request #10473 from deathride58/serverhopsanity
[s] adds a basic sanity check to server_hop
2020-01-08 19:16:03 -08:00
Seris02
c7790aba1a moves observe to ghost tab 2020-01-09 10:46:18 +08:00
Ghom
dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs
Fix limb damage
2020-01-09 03:04:44 +01:00
deathride58
580119f038 makes it account for key_valid 2020-01-08 19:17:09 -05:00
deathride58
33df154689 Caches the status topic to prevent low-effort DDoSes 2020-01-08 18:47:45 -05:00
Putnam
df572996b3 fix limb damage 2020-01-08 15:40:35 -08:00
kappa-sama
f69c67cf5c tabs 2020-01-08 17:03:48 -05:00
kappa-sama
ff5901cadb hi 2020-01-08 16:50:40 -05:00
kappa-sama
ceea7cd021 moves these over too 2020-01-08 16:47:22 -05:00
kappa-sama
38015d0d02 moves this 2020-01-08 16:45:52 -05:00
kappa-sama
341e076d40 refill 2 2020-01-08 16:43:47 -05:00
kappa-sama
18b78e7671 refill 2020-01-08 16:43:33 -05:00
kappa-sama
ebf8d048fd perhaps? 2020-01-08 16:42:16 -05:00