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

10091 Commits

Author SHA1 Message Date
Artur
c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +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
DeltaFire
a8ff45ca16 fix 2022-03-22 18:05:58 +01:00
SandPoot
4da5a57688 global 2022-03-16 18:33:32 -03:00
SandPoot
baee52349b Upload files 2022-03-16 15:41:07 -03: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
silicons
4cd8753a23 Merge pull request #15543 from timothyteakettle/floor-tile-moment 
spraypainting a stack of floor tiles makes the placed tile the same colour!
 2022-03-10 16:51:18 -07:00
silicons
2a5a79f751 Merge pull request #15536 from SandPoot/JPS 
Implements JPS (Jump Point Search) Pathfinding
 2022-03-10 16:51:07 -07:00
Timothy Teakettle
59451d9088 Update plating.dm 2022-03-07 19:45:58 +00:00
Timothy Teakettle
1f00f61380 Update plating.dm 2022-03-07 19:45:27 +00:00
SandPoot
21b68944e7 Upload files 2022-03-05 16:00:12 -03:00
SandPoot
45a49c6106 Upload files 2022-03-05 13:49:26 -03: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
silicons
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
silicons
fe427e7516 Merge pull request #15503 from Arturlang/Bodybuilding 
Lets the limbgrower make mobs with only a chest
 2022-02-26 18:08:12 -07:00
SandPoot
f7ea1f377d oops, replace all is a hell of a drug 2022-02-25 17:09:31 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
Timothy Teakettle
56547a2556 generalizes recipe searching, adds chemistry functionality 2022-02-23 11:38:04 +00:00
timothyteakettle
4adb870324 improves formatting of the couldn't find reagent text 2022-02-23 00:57:39 +00:00
timothyteakettle
b578c65d74 fixes 2022-02-23 00:52:17 +00:00
SandPoot
6c347a9186 Fixes targets (#15521) 
* Automatic changelog compile [ci skip]

* Update files

Co-authored-by: Changelogs <action@github.com>
 2022-02-22 15:50:32 -07:00
Timothy Teakettle
fd997e1615 initial test changes 2022-02-22 21:59:28 +00:00
Lin
1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport 
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
 2022-02-21 00:02:21 +00:00
Artur
5d446f9133 Merge branch 'Bodybuilding' of https://github.com/Arturlang/Citadel-Station-13 into Bodybuilding 2022-02-21 01:09:30 +02:00
Artur
29a4e10592 Looping performance tweaks 2022-02-21 01:09:21 +02:00
Putnam3145
a49b19a4f7 makes reinforced plasma glass windows buildable 2022-02-19 19:14:48 -08:00
Arturlang
2b11cfcc33 Linz's suggestion 
Co-authored-by: Lin <linzolle@gmail.com>
 2022-02-19 12:55:35 +02:00
Arturlang
86c711a003 Apply suggestions from code review 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-02-18 23:44:03 +02:00
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
Artur
50455227f1 More comments 2022-02-16 00:49:46 +02:00
Artur
f404390c91 Edge case and documentation 2022-02-16 00:46:25 +02:00
silicons
5b75509603 Merge pull request #15265 from keronshb/familyport 
(Ready for Testing) Ports MRP Families and hardsync
 2022-02-13 02:32:26 -08:00
silicons
4632c85d71 silly proof of concept item (#15456) 
* should have listened to putnam

* why am i doing this

* that

* lmao

* more

* it compiles

* it compiles

* fixes

* FUNNY GLOW SWORD

* more..

* unterminated text

* wthat wasn't working

* it's coming together

* woo

* what have i done

* fin.

* eh
 2022-02-11 21:04:21 -08:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
Artur
fc6f3cdffc tested and done, seems to work 2022-02-11 16:54:05 +02:00
Artur
345c1616f2 Adds a way to build bodies using the limbgrower 2022-02-10 18:49:24 +02:00
silicons
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
SandPoot
7e970fe5f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui 2022-02-04 13:06:20 -03:00
silicons
be82946ff6 Merge pull request #15491 from SandPoot/autolathe-tgui 
Ports TGUI for autolathe
 2022-02-04 07:57:22 -08:00
Sakura
08b38a7e70 Ashwalker Update (#15466) 
* Ashwalker Update

* Update generic_positive_events.dm

* Update ashwalker.dm

* fixing newlines

* Update code/modules/antagonists/_common/antag_datum.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* literally 1984

* unlimiting spawns

* Create antag_datum.dm.bak

* Revert "Create antag_datum.dm.bak"

This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-02-03 19:34:15 -08:00
SandPoot
4c93bfc764 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui 2022-02-02 02:07:13 -03:00
SandPoot
29be8573ea Upload files 2022-02-02 02:01:04 -03:00
SandPoot
760ed48476 Upload files 2022-02-02 00:45:32 -03:00
SpiWat
386a7480a7 Tweenty -> Twenty 
Spelling.
 2022-01-31 19:12:00 -05:00
silicons
9205545d16 Merge pull request #15317 from LetterN/what-should-i-name-this-branch 
TGUI hardsync & stuff
 2022-01-25 00:06:59 -08:00