Commit Graph

26895 Commits

Author SHA1 Message Date
lolman360 0f9f1e240c w 2020-08-24 00:51:13 +10:00
lolman360 4b2b4afc64 e 2020-08-24 00:49:31 +10:00
lolman360 eda8d516b9 e 2020-08-24 00:41:22 +10:00
lolman360 a032fb4a3d e 2020-08-24 00:35:12 +10:00
lolman360 6463d0b785 Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants 2020-08-24 00:27:29 +10:00
lolman360 b74c5ba22d ee 2020-08-24 00:27:22 +10:00
lolman360 cdc7490ee1 e 2020-08-24 00:26:26 +10:00
lolman360 460c92de74 3 2020-08-24 00:20:04 +10:00
lolman360 1f576dfd12 Update smithed_items.dm 2020-08-24 00:15:27 +10:00
lolman360 d45ac6323a Update smithed_items.dm 2020-08-24 00:09:58 +10:00
Letter N 2ddddbbbaa input moment 2020-08-23 22:07:26 +08:00
lolman360 289280f0ec Update recipes_misc.dm 2020-08-24 00:00:39 +10:00
lolman360 05250939c6 e 2020-08-23 23:58:04 +10:00
lolman360 ccf8aaf412 ee 2020-08-23 23:53:38 +10:00
silicons e1e0d5e1da Update firedoor.dm 2020-08-23 06:50:47 -07:00
silicons b2a38a09a1 circuit 2020-08-23 05:59:24 -07:00
silicons b995581a11 changes 2020-08-23 05:33:19 -07:00
silicons bd5766a8be changes 2020-08-23 05:27:53 -07:00
lolman360 ce2dca5932 Update anvil.dm 2020-08-23 22:19:25 +10:00
silicons 2fa023346a Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
2020-08-23 05:08:50 -07:00
silicons 7f942abef2 Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
2020-08-23 05:08:14 -07:00
Putnam3145 ecbf8a5dc2 Merge pull request #13245 from Arturlang/fortitude_norun
Fortitude walking fix
2020-08-23 04:33:51 -07:00
Artur b47b14cdaa Shoot me please 2020-08-23 14:26:07 +03:00
Letter N b8d812fb47 "what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50 2020-08-23 17:18:32 +08:00
lolman360 e138536cb6 eee eee eee 2020-08-23 18:29:01 +10:00
lolman360 c8ecfdf4a9 Update anvil.dm 2020-08-23 17:50:33 +10:00
lolman360 04a755746b oh yeah 2020-08-23 17:45:13 +10:00
lolman360 73932b27d2 TESTMERGE TIME? 2020-08-23 17:43:34 +10:00
lolman360 220546b558 you forgot the knife idiot 2020-08-23 17:19:30 +10:00
lolman360 ce4d50b9a9 E 2020-08-23 17:09:13 +10:00
lolman360 bc14155632 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-23 17:01:45 +10:00
lolman360 1deafc7103 its asking me to commit hold on 2020-08-23 17:01:32 +10:00
lolman360 2a3ada511e It's all codersprites?
Always has been.
2020-08-23 16:51:55 +10:00
lolman360 1146ed0d1f is thsi it 2020-08-23 13:12:51 +10:00
Suicidalpickles 811a6708df h 2020-08-22 18:01:18 -07:00
Putnam 87080bfac4 Made all death release vore contents, not just gibbing/dusting 2020-08-22 17:51:32 -07:00
timothyteakettle b68baf2f25 this is funny 2020-08-23 01:44:33 +01:00
Timothy Teakettle c1a4ad5ea4 non greyscale moths deserve love too 2020-08-22 23:28:03 +01:00
silicons 188bb13272 Merge pull request #13181 from Putnam3145/dynnamic
Dynamic: tweaks and fixes: the reckoning
2020-08-22 15:22:19 -07:00
silicons c7c74e7c51 Merge pull request #13213 from lolman360/breath
breath mask balaclava
2020-08-22 15:22:04 -07:00
silicons 876dc36dbc Merge pull request #13201 from kiwedespars/return-the-punch
makes it so you can craft armwraps roundstart again.
2020-08-22 15:21:22 -07:00
silicons 68ee7b12bf Merge pull request #13236 from timothyteakettle/lizard-fixes
lizards are shitcode
2020-08-22 15:19:48 -07:00
silicons a4aeb38433 Merge pull request #13221 from Ludox235/fuck-lowpop-xenos
>10 pop xenos >FOR (ALLEGEDLY) 5 YEARS
2020-08-22 15:19:21 -07:00
silicons 7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835
Removing priority overlays, update_icon() splitup for guns.
2020-08-22 15:19:07 -07:00
silicons 5c09004dc1 Merge pull request #13228 from DeltaFire15/apc-ui-access-fixes
Fixes silicons and ratvarians accessing APCs
2020-08-22 15:19:00 -07:00
zerothebigboy 21836b4ec8 : ) 2020-08-22 18:11:03 -04:00
Hatterhat 4364d2c85f thanks travis 2020-08-22 16:17:34 -05:00
Hatterhat 8645a2954f tackle hando 2020-08-22 16:13:41 -05:00
Hatterhat 093928eab2 holopara buyonce 2020-08-22 15:46:14 -05:00
Hatterhat 236db857dc pda bomb buyonce 2020-08-22 15:42:20 -05:00