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

20204 Commits

Author SHA1 Message Date
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
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
be46eba465 Moves stasis handling to component-based 2022-04-07 14:10:51 +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
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
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
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
d711a0901c Dual seater coming right up. 2022-03-23 13:05:51 -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
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
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
SandPoot
baee52349b Upload files 2022-03-16 15:41:07 -03:00
SandPoot
aec888a7b6 Update files 2022-03-16 15:17:57 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00: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
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
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
857253a07b who names a var T. 2022-03-10 21:42:27 -08:00
silicons
2a5a79f751 Merge pull request #15536 from SandPoot/JPS 
Implements JPS (Jump Point Search) Pathfinding
 2022-03-10 16:51:07 -07:00
silicons
cdefa4f64a Merge pull request #15535 from SandPoot/statpanel 
Statpanel update
 2022-03-10 16:50:59 -07:00
silicons
b1ba1d60f0 Merge pull request #15534 from SandPoot/screentips 
Screentips
 2022-03-10 16:50:28 -07:00
silicons
234b3eae8f Merge pull request #15540 from Citadel-Station-13/more-tritium-enthalpy 
Adds a LOT more enthalpy to tritium
 2022-03-10 16:47:15 -07:00
Putnam3145
a44d0af4dc hackish supermatter dying on spaced nearby turfs 2022-03-09 07:49:02 -08:00
Putnam3145
993db66237 Adds a LOT more enthalpy to tritium 2022-03-06 14:54:48 -08:00
Putnam3145
062da9bb05 fixed dynamic days (lowertext) 2022-03-06 13:18:59 -08:00
SandPoot
7bf1bcf857 Some updates 2022-03-05 16:18:17 -03:00
SandPoot
21b68944e7 Upload files 2022-03-05 16:00:12 -03:00
SandPoot
5f083fbddd Upload files 2022-03-05 14:22:42 -03:00
SandPoot
45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
Timothy Teakettle
778bf1777b fixes coiling issue (#15530) 
* why

* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant

* fix

* Update preferences.dm

* no slimes you're not allowed the hidden sprite
 2022-02-28 14:01:57 -08:00
Lin
ae5896d6cf Merge pull request #15525 from keronshb/ambitioncheck 
Ambitions from Skyrat
 2022-02-27 02:34:13 +00:00
silicons
2323bd31cd Merge pull request #15522 from bunny232/wintercoats 
Insulation works both ways you know.
 2022-02-26 18:08:59 -07:00
silicons
edd3a510f1 Merge pull request #15526 from timothyteakettle/bartender-pda 
adds bartender cartridge for drink recipe searching, updates chemist cartridge to have equivalent functionality for all recipes
 2022-02-26 18:08:47 -07:00