shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,617 Commits 5 Branches 0 Tags
ca5d388bc7e65037898dfa94586dc50daba334d2
Commit Graph

9995 Commits

Author SHA1 Message Date
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
Hatterhat
cd0c2aa496 your jordans are fake 2022-01-02 04:33:25 -06:00
Putnam3145
c97d09c0ad Fixes bluespace pipes (I think) (#15437) 2022-01-01 19:48:03 +01:00
DeltaFire
2940d141cf please-dont-smite-us-lummox 2022-01-01 07:10:35 +01: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
Lin
0ba9f4254c Merge pull request #15435 from TripleShades/aaaaa 
Festive Station Fixes
 2021-12-28 21:35:28 +00:00
TripleShades
226a299aff Update dirt.dm 2021-12-19 17:29:01 -05:00
SandPoot
67cfd000fe Upload files 2021-12-16 12:57:21 -03:00
Lin
f89729afb7 Merge pull request #15421 from DeltaFire15/more_overrides 
Fixes even more linter stuff
 2021-12-11 18:08:33 +00:00
keronshb
6ab0d1b70c Adds Clock Cult to the midround pool. (#15338) 
* Midround Clock Cult

Adds midround clock cultists

* Is eligible

* Reebe load proc

* Moves load reebe

* One tab out
 2021-12-08 19:06:11 +01:00
DeltaFire
50be57f107 grrrr 2021-12-08 18:33:06 +01:00
DeltaFire
04797a961b linters b gone 2021-12-08 05:07:22 +01: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
Putnam3145
0ef0991d65 another tweak to it, for good measure 2021-11-26 22:49:30 -08:00
Putnam3145
2558789015 Adjusted bomb numbers 2021-11-26 20:18:47 -08:00
Linzolle
3084ef1231 areas and power and atmos oh my 2021-11-26 20:50:39 -07:00
Linzolle
776f69e119 turfs go in the turfs file and it is too cold 2021-11-26 19:53:33 -07: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
keronshb
5498d7ed13 Reverts unintended area changes to other maps 2021-11-21 10:50:22 -05: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
Chayse Ramsay
9545b180c6 Update grenade.dm 2021-11-21 06:08:20 +00:00
keronshb
af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
Lin
1de965a90e Merge pull request #15385 from buffyuwu/crayons.dm 
dont color my entire canvas neon green when im painting please
 2021-11-20 03:36:38 +00:00
Lin
d395824007 Merge pull request #15383 from MrJWhit/thinnining-trash 
Thins up the loot piles
 2021-11-20 03:35:56 +00:00
Lin
43e4c71d04 Merge pull request #15384 from SandPoot/acid-bgone 
Acid overlay no longer lingers after done
 2021-11-19 23:02:49 +00:00
Artur
99dedb54ed Merge remote-tracking branch 'upstream/master' into admin_mapsave 2021-11-20 00:16:56 +02:00
Putnam3145
cf4cc39a3b Merge pull request #15222 from raspy-on-osu/apcfix 
save hours of pain for new engineers with this one simple trick!! click here to find out
 2021-11-18 20:18:11 -08:00
buffyuwu
612087f7e5 Update crayons.dm 2021-11-18 20:44:01 -05:00
SandPoot
9d3857c94e Upload files 2021-11-18 14:57:19 -03:00
MrJWhit
47cf0c153a Update loot_pile.dm 2021-11-17 18:36:49 -05:00
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021 
Spookystation (Ball Map) and Vector Cars
 2021-11-17 16:26:07 +00:00
Lin
4e407ffeb6 Merge pull request #15371 from DeltaFire15/unintended-devastation 
Devastation level explosions no longer delete organs of gibbed humans
 2021-11-17 16:19:23 +00:00
DeltaFire
ef9c90d512 embeds, unarmed and wounds 2021-11-16 20:26:38 +01:00
DeltaFire
0e93bd84f8 no funky relay decon and wackyness 2021-11-16 02:22:12 +01:00
Putnam3145
1da28b8ec6 Chem gas tweaks, + toxins rebalance 2021-11-15 16:29:30 -08:00
SandPoot
ca3eaca314 update bedsheet_bin.dm 2021-11-15 20:48:11 -03:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
DeltaFire
3f9ad6a954 should do this instead 2021-11-14 22:44:43 +01:00
DeltaFire
50c7d4914f reebe loading (woo) 2021-11-14 22:25:39 +01:00
DeltaFire
88789e1bbe one 2021-11-14 22:06:52 +01:00
DeltaFire
6224da71a3 contents_explosion 
at least this one had less overrides.
 2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
DeltaFire
7d2ff194d1 this WILL fail CI 
hnnnngh
 2021-11-14 20:48:41 +01:00
Lin
91adaf84b6 Merge pull request #15330 from keronshb/dynamiclog 
Dynamic messages admins if it fails to hijack.
 2021-11-13 04:50:43 +00: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