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

29790 Commits

Author SHA1 Message Date
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
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
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
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
baee52349b Upload files 2022-03-16 15:41:07 -03:00
SandPoot
37fef7fbba Upload files 2022-03-16 15:33:31 -03:00
Lin
c0da155ad5 Merge pull request #15553 from Putnam3145/fix-explosive-compressor 
Fix implosion compressor impossibility
 2022-03-15 19:24:17 +00:00
silicons
6f8fc5125d Update space.dm 2022-03-15 10:24:46 -07:00
Lin
c25e074128 Merge pull request #15547 from Putnam3145/extend-min-pop 
Adds a minimum vote count to continue rounds
 2022-03-14 18:48:11 +00:00
Lin
e819fbdb83 Merge pull request #15546 from Putnam3145/fix-supermatter-exploit 
Makes supermatter take damage (and not heal) if too near to spaced turfs
 2022-03-14 18:47:09 +00:00
Putnam3145
b597675ef4 Fix explosive compressor impossibility 2022-03-14 11:41:20 -07:00
Lin
99e7249a11 Merge pull request #15550 from Putnam3145/fix_should_equalize 
Makes should_do_equalization actually work
 2022-03-14 02:09:03 +00:00
silicons
861a9f854f Merge pull request #15476 from DeltaFire15/core-alt-pr 
Buffs regen core healing for robots on lavaland, nerfs regen cores when not on lavaland
 2022-03-13 14:26:06 -07:00
silicons
fcfde73f5e Merge pull request #15425 from DeltaFire15/slower-organ-healing 
Nerfs* passive organ healing, plus some minor stuff
 2022-03-13 14:26:00 -07:00
silicons
a3284a0923 Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf 
Weakens chemistry's revival chems
 2022-03-13 14:24:57 -07:00
DeltaFire
cb1848d06c no more free money (#15375) 2022-03-13 12:50:30 -07:00
Putnam3145
32803f1cd1 Makes should_do_equalization actually work 2022-03-12 13:54:18 -08:00
Putnam3145
4e2b8949fa it is important that we actually keep track 2022-03-10 21:47:21 -08:00
Putnam3145
857253a07b who names a var T. 2022-03-10 21:42:27 -08:00
Putnam3145
2abe8f1ed6 Actually, no, just a minimum extend vote count 2022-03-10 21:38:39 -08:00
Putnam3145
9b4c3a5be3 Adds a minimum greater vote count to extend rounds 2022-03-10 21:35:08 -08:00