Commit Graph

29838 Commits

Author SHA1 Message Date
silicons 73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
silicons e67340f147 Merge pull request #15590 from SandPoot/noisy-surgery
Adds sound effects to surgeries
2022-04-15 17:43:37 -07:00
silicons c3ef3e7b69 Merge pull request #15588 from SandPoot/save-or-your-progress-will-be-lost
Fixes saving testicle shapes
2022-04-15 17:43:08 -07:00
silicons a1268032d6 Merge pull request #15593 from Putnam3145/fix-linux
Makes auxmos do fires on Linux
2022-04-15 17:42:05 -07:00
silicons da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload)
Every case of initialize that should have mapload, does
2022-04-15 17:41:57 -07:00
SandPoot 13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02:00
BlueWildrose f235839351 Adds carcinisoprojection jelly, a limb regrowth chem that is made from slime mutation toxin & blood (#15053)
* Limb regrowth chem, new disease of crab cancer

* Limb regrowth adjustments

* oops, sorry linters.

* oh right this would probably fuck with dullahans

* woops missed a newline

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* just realized this check is unnecessary.

* let's add a mood debuff while we're at it

* Update medicine_reagents.dm

* add a bounty

* misspelling

* Update crabcancer.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2022-04-15 00:37:08 +02:00
Putnam3145 4d98d7cedb makes bombs not super OP on linux, too 2022-04-09 22:25:08 -07:00
Putnam3145 9e9c38c4a5 Makes auxmos do fires on Linux 2022-04-09 21:44:04 -07:00
SandPoot 52c144090e Upload fixes (#15591) 2022-04-10 00:44:27 +02:00
SandPoot 4e296b72d5 Upload files 2022-04-09 15:42:57 -03:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9ad734034a Update mecha_construction_paths.dm 2022-04-09 02:42:01 -03:00
Lin fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot d6624eb705 mech updat 2022-04-09 00:03:33 -03:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03: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
SandPoot 64d18a3050 Update preferences_savefile.dm 2022-04-08 21:09:29 -03:00
SandPoot 1bb76168c4 fix 2022-04-08 14:12:26 -03:00
silicons 904990a037 Merge pull request #15584 from Arturlang/StasisBeds
Stasis beds
2022-04-08 09:47:26 -07: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
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
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 05ff3406ea do this 2022-04-06 17:35:11 -03: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
Lin 3d04fac657 Merge pull request #15576 from Putnam3145/fix-recycler-runtime
Fix recycler runtime
2022-04-02 07:17:31 +00: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 a70fb1fb43 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-31 15:29:31 -04: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
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
Solaris-Shade a4f8789d68 DO it not HIT it!
https://github.com/tgstation/tgstation/pull/65061
2022-03-24 22:43:17 -04:00
Solaris-Shade 01f28163c2 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-24 20:40:31 -04:00
Lin dbb2db5cc1 Merge pull request #15570 from bunny232/Oral
Climax with partner now counts mouth
2022-03-24 21:39:02 +00:00
SandPoot 8cfb7a1bf4 They no longer snap south! 2022-03-24 01:03:42 -03:00
SandPoot d711a0901c Dual seater coming right up. 2022-03-23 13:05:51 -03:00
SandPoot 205c9b3d43 Those are too early. 2022-03-23 12:21:29 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00