Commit Graph

26895 Commits

Author SHA1 Message Date
Putnam3145 44f05bcb21 Merge pull request #13372 from Citadel-Station-13/silicons-patch-35
please stop using explosive holoparasites to make instant kill toolboxes
2020-10-01 02:35:12 -07:00
The0bserver a9e727954e No more automagic 2020-10-01 04:49:07 -04:00
The0bserver 5a03688bdb Dirt not powered, var cleanup, plumbing enable 2020-10-01 04:43:02 -04:00
The0bserver 48df6a9494 I shot the tray, I made an accurate tip. 2020-10-01 04:07:16 -04:00
Letter N c7875f2792 commit 3 2020-10-01 12:54:49 +08:00
Letter N d9ab31e199 commit 2 2020-10-01 11:30:01 +08:00
Letter N 945bf051bd get railed 2020-10-01 11:28:56 +08:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Tupinambis b60e22eaba Fragility. 2020-09-30 19:39:54 -05:00
Tupinambis 67825fef74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into CarbonHydrogenBromine 2020-09-30 19:21:21 -05:00
Tupinambis 9dd7064321 language sprites 2020-09-30 19:20:44 -05:00
Tupinambis 0bb889932d Completed! 2020-09-30 19:05:56 -05:00
timothyteakettle 27c5897c4d update button icon and stand up 2020-10-01 00:17:17 +01:00
Zandario da0c7a0ff2 Merge remote-tracking branch 'upstream/master' into species-refactor 2020-09-30 17:06:54 -05:00
Tupinambis a3a5fe4c2d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into spooder 2020-09-30 16:07:21 -05:00
Tupinambis 8828440575 fix 2020-09-30 16:06:56 -05:00
Timothy Teakettle 16735e0190 silent paralysis 2020-09-30 21:40:42 +01:00
Timothy Teakettle 6b46fdbc32 fine 2020-09-30 21:16:09 +01:00
Tupinambis 113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
Timothy Teakettle df6724f02e Merge remote-tracking branch 'upstream/master' into slime-puddle 2020-09-30 19:55:54 +01:00
silicons 28ea9cc91c Merge pull request #13469 from Citadel-Station-13/revert-13436-worse-idea
Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA"
2020-09-30 11:54:52 -07:00
Timothy Teakettle 7cab2c658d Merge branch 'master' into slime-puddle 2020-09-30 18:43:25 +01:00
Timothy Teakettle 2223cfeb28 better 2020-09-30 18:41:30 +01:00
silicons 9f3b456583 Merge pull request #13416 from BlueWildrose/slimenoises
Unique slimeperson screams and laughter, and adds new customizable speech verbs
2020-09-30 09:22:25 -07:00
Putnam c644495e5e dodgin bullets 2020-09-29 21:07:41 -07:00
Putnam 0c7003b3a5 never code while tired 2020-09-29 20:37:48 -07:00
Timothy Teakettle d783eb58bd more traits 2020-09-30 02:58:58 +01:00
Timothy Teakettle f9cf7429e1 icons and traits 2020-09-30 02:49:21 +01:00
timothyteakettle ccb774b8f2 puddles 2020-09-30 02:15:34 +01:00
zeroisthebiggay 40f404498d ok
ok
2020-09-29 18:51:28 -04:00
Zandario 9104e2c041 Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA" 2020-09-29 15:40:12 -05:00
Zandario 515c842976 Part 1 2020-09-29 15:14:27 -05:00
EmeraldSundisk a41963fa13 Update space.dm 2020-09-29 13:03:11 -07:00
EmeraldSundisk 41d263da84 Update space.dm 2020-09-29 12:43:40 -07:00
Timothy Teakettle 1b75ccb39d puddle 2020-09-29 18:38:25 +01:00
Putnam f8200a5838 Shitcode fixing inop code. 2020-09-29 06:40:09 -07:00
Putnam 0aec88eaed escape those newlines 2020-09-29 06:12:10 -07:00
Putnam 8704949694 whoops forgot a semicolon 2020-09-29 05:58:04 -07:00
Putnam 3839343cd8 i forgot to save the #define 2020-09-29 05:57:46 -07:00
Putnam 02b2248f3a i am not smart at all 2020-09-29 05:56:34 -07:00
Putnam 4d2a2b178b Made transfer_ckey reset view range. 2020-09-29 04:11:01 -07:00
Putnam 8a01b949bf Cleaned up SDGF and consistencised clones. 2020-09-29 03:47:09 -07:00
EmeraldSundisk 633da981e2 Update space.dm 2020-09-28 23:01:31 -07:00
EmeraldSundisk 0f88f93f59 4now 2020-09-28 22:51:59 -07:00
timothyteakettle 396872e98e show the right thing 2020-09-28 23:21:34 +01:00
Timothy Teakettle 783c33067b typo moment 2020-09-28 22:13:33 +01:00
Detective Google 643421bc23 adds arcade carpets
yay
2020-09-28 14:43:03 -05:00
Timothy Teakettle 29368a4479 sprites 2020-09-28 18:55:01 +01:00
lolman360 a2b7fd2279 sprite 2020-09-28 16:09:10 +10:00
lolman360 9860d296b8 what the fucjk 2020-09-28 14:05:53 +10:00