Commit Graph

45474 Commits

Author SHA1 Message Date
evan 0ca84b7cc5 Update species.dm
woops, forgot something
2021-12-07 22:11:56 -05:00
evan 5a7dbfe9ef Update pool_controller.dm 2021-12-07 21:50:16 -05:00
evan afe6179191 Update species.dm 2021-12-07 21:39:17 -05:00
evan 2099f18506 Update pool_controller.dm 2021-12-07 21:28:30 -05:00
Changelogs 6f8f1edd43 Automatic changelog compile [ci skip] 2021-12-05 00:30:33 +00:00
CitadelStationBot 5bac0cb3f9 Automatic changelog generation for PR #15400 [ci skip] 2021-12-04 18:23:58 -06:00
Lin a3f5dd01d9 Merge pull request #15400 from Arturlang/LaTeX-in-paper
LaTeX-in-paper
2021-12-05 00:23:55 +00:00
Lin daa751d686 Merge pull request #15406 from TripleShades/fixies
Box Perma Fixes
2021-12-04 22:36:03 +00:00
CitadelStationBot 0630a1e343 Automatic changelog generation for PR #15407 [ci skip] 2021-12-04 16:35:54 -06:00
Lin c08d7a8961 Merge pull request #15407 from DeltaFire15/fireman-carryloss
Fixes fireman carry dropping the carried target if passing over a prone individual
2021-12-04 22:35:51 +00:00
DeltaFire e576962ac3 e 2021-12-03 18:29:13 +01:00
TripleShades a8fb8afecb Update BoxStation.dmm 2021-12-02 20:32:40 -05:00
Changelogs 4db81db5f7 Automatic changelog compile [ci skip] 2021-12-03 00:28:00 +00:00
CitadelStationBot ce6fe64427 Automatic changelog generation for PR #15403 [ci skip] 2021-12-01 20:42:06 -06:00
Lin 4b7b814e70 Merge pull request #15403 from TripleShades/fixies
Pubby Holopad
2021-12-02 02:42:03 +00:00
Changelogs ea321fe39f Automatic changelog compile [ci skip] 2021-12-02 00:28:13 +00:00
CitadelStationBot 5d0e8ed6e8 Automatic changelog generation for PR #15335 [ci skip] 2021-11-30 18:39:05 -06:00
Lin e506bc50dc Merge pull request #15335 from DeltaFire15/synth-chem-time
Synth / IPC kinda-buffs - Chemwarfare Edition
2021-12-01 00:39:02 +00:00
Changelogs fc26498ccb Automatic changelog compile [ci skip] 2021-12-01 00:29:57 +00:00
CitadelStationBot d9c2c2f048 Automatic changelog generation for PR #15380 [ci skip] 2021-11-30 14:24:45 -06:00
Lin 5dc9704e5d Merge pull request #15380 from DeltaFire15/oops-all-wounds
Block & Pellet wound pass
2021-11-30 20:24:42 +00:00
TripleShades 85a0452c6d Update PubbyStation.dmm 2021-11-30 14:36:43 -05:00
Changelogs 48f7b0b2b5 Automatic changelog compile [ci skip] 2021-11-30 00:28:56 +00:00
Changelogs a2a34a7bce Automatic changelog compile [ci skip] 2021-11-29 00:28:17 +00:00
Artur 2ce966f837 Too big lines for tgui linter 2021-11-28 19:51:35 +02:00
Artur f922663aaf Whoops: Removed debug logging 2021-11-28 19:41:46 +02:00
Artur c4272299fb Adds equations to the paper UI! 2021-11-28 19:41:21 +02:00
Changelogs 34933cae76 Automatic changelog compile [ci skip] 2021-11-28 00:28:42 +00:00
CitadelStationBot 1460ac35d9 Automatic changelog generation for PR #15386 [ci skip] 2021-11-27 17:44:53 -06:00
Lin 336a66edd5 Merge pull request #15386 from keronshb/winterball2021
FestiveMap (Winter Ball 2021)
2021-11-27 23:44:51 +00:00
CitadelStationBot f426a114d7 Automatic changelog generation for PR #15396 [ci skip] 2021-11-27 16:50:58 -06:00
Lin 1711a89efd Merge pull request #15396 from TripleShades/fixies
Various Main Map Tweaks
2021-11-27 22:50:54 +00:00
Linzolle fb3fa9ac17 mores wires :^) 2021-11-26 22:59:02 -07:00
Linzolle f74872970e wiring shenanigans 2021-11-26 22:36:52 -07:00
Linzolle 9756528f63 why are there space tiles here 2021-11-26 22:22:29 -07:00
Linzolle eddf853b74 dumb gas mix var 2021-11-26 21:52:58 -07:00
Linzolle fdf4b88f6b observer runtime 2021-11-26 21:37:00 -07:00
Linzolle 34a7953b2f maybe don't have lavaland atmos on the ball map 2021-11-26 21:29:53 -07:00
Linzolle 8ec47864b7 cool atmos bro 2021-11-26 21:24:55 -07:00
Linzolle 5bd3ab6e61 make sure the streets have power 2021-11-26 21:08:09 -07:00
Linzolle 3084ef1231 areas and power and atmos oh my 2021-11-26 20:50:39 -07:00
Linzolle 776f69e119 turfs go in the turfs file and it is too cold 2021-11-26 19:53:33 -07:00
Linzolle afe81f711b Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball 2021-11-26 18:46:57 -07:00
keronshb 2152e5b749 Critical map fix 2021-11-26 20:40:31 -05:00
CitadelStationBot c957b59f3d Automatic changelog generation for PR #15397 [ci skip] 2021-11-26 18:47:53 -06:00
Lin 43aa80f9e7 Merge pull request #15397 from SandPoot/lewdcap-
Allows toggling of Captain's female formal outfit's legs
2021-11-26 17:47:50 -07:00
Changelogs f975f960f5 Automatic changelog compile [ci skip] 2021-11-27 00:26:35 +00:00
Artur c308485ce1 TG update for PaperSheet.js
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-11-26 10:26:57 +02:00
Changelogs 947e1523f1 Automatic changelog compile [ci skip] 2021-11-26 00:27:32 +00:00
SandPoot 3618248b4e Upload files 2021-11-24 23:11:12 -03:00