shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,231 Commits 5 Branches 0 Tags
13fb647b9efa36cd4afff0fe8614d7a9fbc695d7
Commit Graph
1251 Commits
Author SHA1 Message Date
SandPootandGitHub 13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02:00
siliconsandGitHub dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
siliconsandGitHub 904990a037 Merge pull request #15584 from Arturlang/StasisBeds 
Stasis beds
 2022-04-08 09:47:26 -07: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
LinandGitHub 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
BlueWildroseGitHubSandPootPutnam3145
 		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
LinandGitHub 22a49c1dd7 Merge pull request #15564 from SandPoot/bad-getatomonturf 
Fixes balloon alerts sourced on turfs
 2022-03-20 22:30:34 +00:00
SandPoot 3ee2d12b34 Upload files 2022-03-18 12:45:07 -03:00
SandPootandGitHub 96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
SandPoot 4da5a57688 global 2022-03-16 18:33:32 -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 7bf1bcf857 Some updates 2022-03-05 16:18:17 -03:00
SandPoot 21b68944e7 Upload files 2022-03-05 16:00:12 -03:00
LinandGitHub ae5896d6cf Merge pull request #15525 from keronshb/ambitioncheck 
Ambitions from Skyrat
 2022-02-27 02:34:13 +00:00
siliconsandGitHub bf9afd846d Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system 
[PORT] Removes the non bitflag slot defines
 2022-02-26 18:08:28 -07:00
siliconsandGitHub 87e58fcc14 Merge pull request #15505 from SandPoot/playertimes-tgui 
Player Playtime TGUI
 2022-02-26 18:08:18 -07:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
keronshb 3ea22f97a6 Merge remote-tracking branch 'upstream/master' into ambitioncheck 2022-02-22 17:10:25 -05:00
silicons ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
SandPoot c42aa2c30a Upload files 2022-02-15 22:16:07 -03:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
siliconsandGitHub af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460) 
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
 2022-02-07 15:17:24 -08:00
LetterN 958b0ef583 dupe defines bad 2022-01-11 10:01:35 +08:00
LetterN 18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
SandPootandGitHub 8510dcc08a Ports tgui stripping (finally) (#15401) 
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
 2021-12-30 07:40:15 +01:00
keronshb 83a62ace04 Ambitioncheck 2021-12-23 21:15:31 -05:00
LetterN fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
LinandGitHub e506bc50dc Merge pull request #15335 from DeltaFire15/synth-chem-time 
Synth / IPC kinda-buffs - Chemwarfare Edition
 2021-12-01 00:39:02 +00:00
LetterN fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
DeltaFire b4e6b0785d chemscan 
chemscanning (reads: health analyzers mostly) show reagents in grey if not processable due to being invalid
 2021-11-12 19:38:10 +01:00
LetterN 8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
keronshb 659d7aa715 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-11 19:35:40 -05:00
siliconsandGitHub c11d769388 Update _lists.dm 2021-11-09 20:17:34 -07:00
keronshb 9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
silicons a32eabb7ae fix 2021-10-29 22:44:01 -07:00
LetterN a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08:00
LetterN 99019166e4 i think it works 
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
 2021-10-30 11:45:50 +08:00
keronshb 8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
LetterN 49940c373e tgui backend 2021-10-28 12:51:31 +08:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
keronshb 6331ced3e5 The rest of the offering stuff 2021-10-13 22:13:33 -04:00
keronshb bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
SandPoot 437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
keronshb 65d2bf3d33 Better round end report 2021-09-30 19:00:00 -04:00
keronshb fa193aabfa End Report threat 2021-09-30 14:43:13 -04:00