shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,202 Commits 5 Branches 0 Tags
d6624eb705bcb9d9cce8eb15de4170e7d0013ba7
Commit Graph

29806 Commits

Author SHA1 Message Date
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
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
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
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
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
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
SandPoot
d8f656ecf1 restores EMP behavior 2022-03-23 10:26:58 -03:00
bunny232
554c38fedf Update code/modules/arousal/arousal.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2022-03-23 05:28:24 -04:00
DeltaFire
a8ff45ca16 fix 2022-03-22 18:05:58 +01:00
BlueWildrose
ac1c3511b1 Advanced mutation toxin nerf; new cure, removes instant subspecies transformation (#15497) 
* Advanced mutation toxin nerf

* Adv Mut Toxin nerf fix - needs all cures to FALSE
 2022-03-22 17:17:18 +01:00
evan
8ddf825aa8 Update arousal.dm 2022-03-22 01:22:54 -04:00
silicons
ff6ed43bc1 Merge pull request #15438 from LiteralMushroom/patch-5 
Makes it so alter form can affect eyes.
 2022-03-21 18:56:47 -07:00
Lin
22a49c1dd7 Merge pull request #15564 from SandPoot/bad-getatomonturf 
Fixes balloon alerts sourced on turfs
 2022-03-20 22:30:34 +00:00
SandPoot
11daaadf79 arguments. 2022-03-18 18:43:40 -03:00
SandPoot
16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot
3ee2d12b34 Upload files 2022-03-18 12:45:07 -03:00
SandPoot
96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
Lin
ec380ce26b Merge pull request #15559 from SandPoot/logging-runtimes 
Solves some LOG_VICTIM issues
 2022-03-18 00:00:25 +00:00
Lin
f2896f3afb Merge pull request #15556 from Citadel-Station-13/silicons-patch-1 
fixes parallax trying to make null objects
 2022-03-17 06:23:40 +00:00
SandPoot
4da5a57688 global 2022-03-16 18:33:32 -03:00
SandPoot
11522b7761 global var 2022-03-16 18:21:37 -03:00
SandPoot
25bcad7be8 Update code/datums/components/armor_plate.dm 2022-03-16 18:06:25 -03:00
SandPoot
baee52349b Upload files 2022-03-16 15:41:07 -03:00
SandPoot
37fef7fbba Upload files 2022-03-16 15:33:31 -03:00
SandPoot
fdb6413d23 You guys want some logs? 2022-03-16 15:22:04 -03:00
SandPoot
aec888a7b6 Update files 2022-03-16 15:17:57 -03:00