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

6296 Commits

Author SHA1 Message Date
Artur
c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03: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
DeltaFire
a8ff45ca16 fix 2022-03-22 18:05:58 +01: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
SandPoot
21b68944e7 Upload files 2022-03-05 16:00:12 -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
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
Putnam3145
a49b19a4f7 makes reinforced plasma glass windows buildable 2022-02-19 19:14:48 -08: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
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
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
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
silicons
f601580854 Merge pull request #15430 from DeltaFire15/synth-coolant 
Synth stuff : Balancing Nightmare Edition (aka, coolant)
 2022-01-22 13:59:12 -08:00
LetterN
7e326ed947 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-22 20:42:55 +08:00
silicons
f85d0dbda0 Merge pull request #15449 from Putnam3145/gib-podpeople 
Allows pod people to be made using other fluids
 2022-01-22 04:34:59 -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
Lin
d7cbb017f6 Fix few instances of bleeding white blood (#15398) 
* no longer bleed white blood

* parentheses man

* fix that one bdm map spawn too
 2022-01-09 17:23:48 +01:00
Lin
41be63dbbc Merge pull request #15452 from Hatterhat/jump-timbs 
your jordans are fake - adds a mining boot skin for jumpboots
 2022-01-03 22:34:38 +00:00
Lin
2379a2a342 Merge pull request #15370 from Putnam3145/genericized-plasma-trit 
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
 2022-01-03 22:31:40 +00:00
DeltaFire
074fe5b417 a bunch of stuff 
5° min temp adjustment for active cooling
150% max total cooling efficiency as opposed to 100%
passive heating cools instead at >100% efficiency (to -30°C min)
EMPs jam cooling system readouts.
Nanogel is now printable, for a decent price though it needs a bit of diamond.
 2022-01-02 19:44:35 +01:00
Hatterhat
cd0c2aa496 your jordans are fake 2022-01-02 04:33:25 -06:00
DeltaFire
2940d141cf please-dont-smite-us-lummox 2022-01-01 07:10:35 +01:00
Putnam3145
c392b7c3fb Allows pod people to be made using other fluids 2021-12-31 14:36:55 -08:00
SandPoot
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
BlueWildrose
9437a97967 Merge branch 'Citadel-Station-13:master' into wingport 2021-12-29 15:27:08 -07:00
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
SandPoot
67cfd000fe Upload files 2021-12-16 12:57:21 -03:00
DeltaFire
0faac6dce6 hoo boy 2021-12-14 23:06:42 +01:00
BlueWildrose
0e3d30e59f Merge branch 'Citadel-Station-13:master' into wingport 2021-12-11 12:53:03 -07:00
DeltaFire
50be57f107 grrrr 2021-12-08 18:33:06 +01:00
Cognition
3b52782ae5 Merge branch 'master' into wingport 2021-12-08 00:02:13 -07:00
DeltaFire
04797a961b linters b gone 2021-12-08 05:07:22 +01:00
Cognition
318240bdc6 TG wing port - Now YOU TOO, can be an "angel" 2021-12-07 18:59:07 -07:00
Lin
e506bc50dc Merge pull request #15335 from DeltaFire15/synth-chem-time 
Synth / IPC kinda-buffs - Chemwarfare Edition
 2021-12-01 00:39:02 +00:00
Lin
5dc9704e5d Merge pull request #15380 from DeltaFire15/oops-all-wounds 
Block & Pellet wound pass
 2021-11-30 20:24:42 +00:00
Linzolle
afe81f711b Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball 2021-11-26 18:46:57 -07:00
Lin
d5c17f0d84 Merge pull request #15376 from SandPoot/double 
Double beds
 2021-11-24 17:38:10 +00:00
Lin
e3a5391250 Merge pull request #14868 from Arturlang/admin_mapsave 
buildmode mapgen tool save [ready]
 2021-11-24 17:32:48 +00:00
Chayse Ramsay
31a0de04d5 Fixes chem nades too, since fixing grenades as a whole broke them changing timer 2021-11-21 06:24:55 +00:00