Commit Graph

9242 Commits

Author SHA1 Message Date
Putnam 126ebf1f5e Update dynamic_storytellers.dm 2020-08-29 01:50:22 -07:00
Putnam cda93af643 Fixes dynamic... again. 2020-08-29 01:41:42 -07:00
Letter N fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Letter N 116145872f commit thing, need to see changies but gitlens is denying me 2020-08-29 14:00:46 +08:00
Timothy Teakettle 1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
raspy-on-osu ca34a50726 Port "Better Explosion Echoes" by NotRanged https://github.com/Skyrat-SS13/Skyrat13/pull/3295 2020-08-27 23:39:43 -04:00
lolman360 55c8250324 AAAAAAAAAAAAAAAAA 2020-08-28 12:44:59 +10:00
Hatterhat 1eb3473132 absolutely goes apeshit on desword data 2020-08-27 19:09:24 -05:00
Chiirno 2df4bedb06 All the errors deleted away 2020-08-27 14:44:19 -03:00
Chiirno fdc2cea077 added chem dispenser, time for errors 2020-08-27 14:27:35 -03:00
silicons 664b2490c3 Merge pull request #13235 from timothyteakettle/bokken-update
buffs bokkens stamina damage by 2
2020-08-27 10:07:31 -07:00
Timothy Teakettle fe25046410 Merge branch 'master' into limbs 2020-08-27 18:06:35 +01:00
silicons 9440a92c09 Merge pull request #13258 from shellspeed1/iv-drips
Ports drip feeding mode for iv drips from tg.
2020-08-27 10:02:43 -07:00
Trilbyspaceclone c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
Artur 6c8b256e48 dont griff please 2020-08-26 20:23:19 +03:00
Artur aaa8046dd2 Lets slime damage structures 2020-08-26 19:32:17 +03:00
Ghommie 2811f744e3 Fixing some mistakes with the priority overlays removal PR. 2020-08-26 14:00:35 +02:00
silicons 8699ce2174 fixes a bunch of broken clickdelays (#13218)
* fixes

* fix
2020-08-25 20:58:20 +02:00
shellspeed1 de7ecefad2 minor description change 2020-08-24 15:07:40 -07:00
shellspeed1 142dee3645 Update iv_drip.dm 2020-08-24 12:47:56 -07:00
lolman360 0ff85deddf Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-25 01:25:34 +10:00
Timothy Teakettle cdb3647c56 thank 2020-08-24 15:38:49 +01:00
timothyteakettle cd7293a9a2 limbs 2020-08-24 03:19:36 +01:00
silicons f86daefa4e Merge pull request #13240 from timothyteakettle/ipcs-spark-when-blush
ipcs make fake electrical sparks when they blush or cry
2020-08-23 17:36:23 -07:00
silicons 82d8b7266f Merge pull request #13238 from Hatterhat/insidious-tackle
insidious combat gloves but they can tackle now
2020-08-23 17:36:03 -07:00
lolman360 f2a7c2599d Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-24 09:36:36 +10:00
lolman360 daeaf81ab6 e 2020-08-24 01:25:26 +10:00
lolman360 0f9f1e240c w 2020-08-24 00:51:13 +10:00
lolman360 4b2b4afc64 e 2020-08-24 00:49:31 +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 460c92de74 3 2020-08-24 00:20:04 +10:00
lolman360 05250939c6 e 2020-08-23 23:58:04 +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
silicons 2fa023346a Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
2020-08-23 05:08:50 -07: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
timothyteakettle b68baf2f25 this is funny 2020-08-23 01:44:33 +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 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
Hatterhat 8645a2954f tackle hando 2020-08-22 16:13:41 -05:00
Letter N 6ba29acd4e uses some cit procs. and how the fuck did i forget to componentualize this 2020-08-22 16:08:05 +08:00
Letter N afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
timothyteakettle 3cf81dcc6c this is better 2020-08-22 01:56:56 +01:00
timothyteakettle 703a4ec262 weaker than fists 2020-08-22 01:47:27 +01:00