Commit Graph

4008 Commits

Author SHA1 Message Date
kevinz000
56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
kevinz000
9bd4719c0a wrong type 2020-02-27 20:09:29 -07:00
kevinz000
045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
kevinz000
f4e49f339b k 2020-02-27 18:29:27 -07:00
kevinz000
b854cb5980 Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
Adds 2cat, again
2020-02-27 01:22:25 -07:00
YakumoChen
f6c170d31b Update tails.dm 2020-02-27 08:15:27 +00:00
YakumoChen
e682845ebf Update tails.dm 2020-02-27 08:09:34 +00:00
YakumoChen
2cb95e200a Update tails.dm 2020-02-27 08:04:32 +00:00
YakumoChen
e0c7c98253 Update tails.dm 2020-02-27 08:01:13 +00:00
kevinz000
f00a2c1cd3 Merge pull request #11202 from Hatterhat/beegions-but-actual-bees
Beegions, But With Actual Bees
2020-02-27 00:59:57 -07:00
kevinz000
40c36213df Merge pull request #11244 from Ghommie/Ghommie-cit589
Fixing virology cause someone didn't covert ALL mob/species biotypes to flags.
2020-02-27 00:57:54 -07:00
kevinz000
a8a8e242d8 Merge pull request #11219 from YakumoChen/LMAO-2CAT!!1
Adds 2cat (tail)
2020-02-27 00:54:47 -07:00
kevinz000
1711fcaa06 k 2020-02-26 15:56:01 -07:00
kevinz000
25a2b34c38 some fixes 2020-02-26 05:59:53 -07:00
kevinz000
872872d9f9 move stuff 2020-02-26 05:38:34 -07:00
kevinz000
76c1d5ddb9 k 2020-02-25 15:40:00 -07:00
kevinz000
5a320c7933 fugg u 2020-02-25 14:37:40 -07:00
kevinz000
40c2bdf5ee oh boy 2020-02-25 14:06:12 -07:00
Ghommie
e02a6f6dea Fixing virology cause someone didn't covert ALL mob/species biotypes to flags. 2020-02-25 15:37:02 +01:00
kevinz000
bfb8139225 DefaultCombatknockdown 2020-02-25 03:18:37 -07:00
kevinz000
8b06f6d4e9 message fix 2020-02-25 03:08:34 -07:00
kevinz000
2eae147e93 ok 2020-02-24 16:51:35 -07:00
Ghom
9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
2020-02-24 16:39:16 +01:00
YakumoChen
6385445fd5 ruining the joke 2020-02-24 10:31:47 +00:00
YakumoChen
ff10b70ffe 2cat heating up 2020-02-24 10:20:47 +00:00
YakumoChen
7a759f68aa Merge pull request #24 from YakumoChen/master
k
2020-02-24 04:58:07 -05:00
YakumoChen
96bf8d6969 Update tails.dm 2020-02-24 09:55:39 +00:00
kevinz000
4fc0ef5e74 Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N
Makes all IPC organs look robotic!
2020-02-24 02:24:06 -07:00
kevinz000
73c03adbbb Merge pull request #11199 from Detective-Google/pai.pai.pai.png
Lets pAIs hold encryption keys and play music.
2020-02-24 02:23:17 -07:00
kevinz000
424eb48d9e fixes 2020-02-24 01:59:45 -07:00
Hatterhat
b89a2314a2 mmm that's compiling i don't like that 2020-02-22 16:17:51 -06:00
Hatterhat
99475488d3 mistake 2020-02-22 15:45:06 -06:00
Ghom
520f5eab83 Merge pull request #11191 from YakumoChen/beelord
Beegions
2020-02-22 22:24:20 +01:00
Ghom
b7fab93209 Merge pull request #11186 from Putnam3145/fixed-flavor
Fixed temp flavor text (for real)
2020-02-22 15:09:58 +01:00
Putnam
d328d554ba Reduced copypasta 2020-02-22 02:38:57 -08:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
kevinz000
b8d60a33bd partial fix 2020-02-21 23:29:13 -07:00
Detective Google
ca29246878 adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) 2020-02-22 00:02:49 -06:00
kevinz000
f2a17b8b35 Update robot_mobility.dm 2020-02-21 18:17:07 -07:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
YakumoChen
418374be06 beegion 2020-02-21 17:56:14 +00:00
YakumoChen
2f2ddbad5a removes density from skulls 2020-02-21 12:07:58 +00:00
YakumoChen
34f1b5d1c8 legion heads now swarm 2020-02-21 10:36:57 +00:00
Putnam
146b2a35f2 fixed temp flavor text (for real) 2020-02-21 00:26:42 -08:00
TrilbySpaceClone
7d8f1320b3 it looks nicer 2020-02-21 03:07:42 -05:00
Ghom
e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
2020-02-21 02:43:04 +01:00
Ghom
4649183a47 Merge pull request #11154 from Kraseo/fuck-nightmares
Fixes nightmares deleting guns with flashlights
2020-02-20 20:52:29 +01:00
Ghom
7763475b83 Merge pull request #10572 from Tupinambis/SiliconDefault
Removes harm prevention clause indicators from relevant sources.
2020-02-20 15:33:27 +01:00
kevinz000
ca777c6c8b Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
2020-02-20 06:17:33 -07:00