Commit Graph

46219 Commits

Author SHA1 Message Date
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
CitadelStationBot
3d91de2f10 Automatic changelog generation for PR #15558 [ci skip] 2022-04-08 20:26:50 -05:00
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
Changelogs
df7d834098 Automatic changelog compile [ci skip] 2022-04-09 00:39:55 +00:00
SandPoot
1bb76168c4 fix 2022-04-08 14:12:26 -03:00
CitadelStationBot
46ed520d79 Automatic changelog generation for PR #15584 [ci skip] 2022-04-08 11:47:29 -05:00
silicons
904990a037 Merge pull request #15584 from Arturlang/StasisBeds
Stasis beds
2022-04-08 09:47:26 -07:00
CitadelStationBot
6662fc5aa3 Automatic changelog generation for PR #15582 [ci skip] 2022-04-08 11:45:23 -05:00
silicons
a40a903497 Merge pull request #15582 from SandPoot/thanks-tg
Fixes bots trying to path through dense corners.
2022-04-08 09:45:19 -07:00
Changelogs
bb6b88217b Automatic changelog compile [ci skip] 2022-04-08 00:42:25 +00:00
Solaris-Shade
1b83713f43 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-07 20:06:32 -04:00
CitadelStationBot
08bfa29b76 Automatic changelog generation for PR #15586 [ci skip] 2022-04-07 15:36:45 -05:00
SandPoot
9c3073168c Fixes the changelogs being absolutely deleted only (#15586)
* Update files

* extra and hidden stuff
2022-04-07 13:36:41 -07:00
Artur
66ce34caa5 Signal and moves it to the back 2022-04-07 15:54:13 +03:00
Artur
3980c97d61 whoops wrong order 2022-04-07 15:32:22 +03:00
Artur
2100133c4b Neeewliiines 2022-04-07 14:34:19 +03:00
Artur
c20a847712 Apparently unnecesary 2022-04-07 14:28:38 +03:00
Artur
be46eba465 Moves stasis handling to component-based 2022-04-07 14:10:51 +03:00
Solaris-Shade
48db01702b Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-06 22:31:51 -04:00
Changelogs
03385972d7 Automatic changelog compile [ci skip] 2022-04-07 00:42:06 +00:00
SandPoot
05ff3406ea do this 2022-04-06 17:35:11 -03:00
CitadelStationBot
0446e472a4 Automatic changelog generation for PR #15565 [ci skip] 2022-04-06 14:12:28 -05:00
silicons
c8cab13081 Merge pull request #15565 from SandPoot/custom-statues
Custom statues and sculpting changes.
2022-04-06 12:12:24 -07:00
Artur
3824daba05 Trailing newlines 2022-04-06 16:10:57 +03:00
Artur
813ca511b5 Remaps sleepers to stasis beds and make stasis actually leave you 2022-04-06 15:58:27 +03:00
Artur
c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
SandPoot
f020aca3dd Update path.dm 2022-04-06 00:04:24 -03:00
Solaris-Shade
416c7412c8 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-04 16:58:17 -04:00
Changelogs
4c3fa08cdf Automatic changelog compile [ci skip] 2022-04-03 00:42:55 +00:00
CitadelStationBot
1a86c82a6d Automatic changelog generation for PR #15576 [ci skip] 2022-04-02 02:17:34 -05:00
Lin
3d04fac657 Merge pull request #15576 from Putnam3145/fix-recycler-runtime
Fix recycler runtime
2022-04-02 07:17:31 +00:00
CitadelStationBot
fb69f6426d Automatic changelog generation for PR #15578 [ci skip] 2022-04-02 02:17:05 -05:00
Lin
2a884f4e01 Merge pull request #15578 from SandPoot/fix-weird-diagonal
Fixes pathfinding not checking diagonal passability properly.
2022-04-02 07:17:02 +00:00
Solaris-Shade
7e689d40ba Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-01 09:09:26 -04:00
Changelogs
55a9d8ddb9 Automatic changelog compile [ci skip] 2022-04-01 00:43:16 +00:00
Solaris-Shade
a70fb1fb43 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-31 15:29:31 -04:00
CitadelStationBot
6663744212 Automatic changelog generation for PR #15304 [ci skip] 2022-03-30 22:06:03 -05:00
BlueWildrose
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-03-30 20:06:00 -07:00
SandPoot
06528b61ae Update files 2022-03-30 22:32:58 -03:00
CitadelStationBot
9d6ec35125 Automatic changelog generation for PR #15574 [ci skip] 2022-03-30 20:09:38 -05:00
Lin
de15958ad5 Merge pull request #15574 from TripleShades/cams
Large Fix and Adjustment Batch (Cams, Pipes, Lightswitches)
2022-03-31 01:09:36 +00:00
Putnam3145
06bda8946a wait, no, that's Lua-like, not even right 2022-03-30 14:55:15 -07:00
Putnam3145
a819424088 Fixes recycler runtime on emergency stop 2022-03-30 14:53:58 -07:00
silicons
bfbba7cb06 blocks investigate log access without R_SENSITIVE (#15573)
* Update admin_verbs.dm

* Update admin_verbs.dm

* Update sql_message_system.dm
2022-03-30 12:42:05 -07:00
TripleShades
7b270dd4f0 wait go back 2022-03-29 02:22:00 -04:00
TripleShades
af197ce22e lizard man points local mapper at the debug tools
local mapper goes FUCKING BONKERS
2022-03-29 02:12:32 -04:00
Solaris-Shade
3681499cd3 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-28 16:46:57 -04:00
Changelogs
f6a78bbf83 Automatic changelog compile [ci skip] 2022-03-28 00:38:28 +00:00
Solaris-Shade
f365aab1e3 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-27 19:58:54 -04:00
CitadelStationBot
c6cc85d991 Automatic changelog generation for PR #15572 [ci skip] 2022-03-27 01:24:56 -05:00