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

4565 Commits

Author SHA1 Message Date
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
Lin
d5c17f0d84 Merge pull request #15376 from SandPoot/double 
Double beds
 2021-11-24 17:38:10 +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
Chayse Ramsay
9545b180c6 Update grenade.dm 2021-11-21 06:08:20 +00: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
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
DeltaFire
ef9c90d512 embeds, unarmed and wounds 2021-11-16 20:26:38 +01:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03: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
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
silicons
5b5eca2beb Merge pull request #15322 from SandPoot/crayon-precision 
Crayon precision mode
 2021-11-09 09:56:03 -08:00
SandPoot
d92a290960 Update crayons.dm 2021-11-01 01:50:30 -03:00
SandPoot
05717c7ae3 Upload files 2021-11-01 01:24:47 -03:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
silicons
9010dc1e41 Merge pull request #15298 from keronshb/whocodedthis 
Fixes DSword and Hyper Eu's wounding, and fixes a slowdown bug with Hyper Eu.
 2021-10-27 13:35:41 -07:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
silicons
679189cb3d Merge pull request #15277 from Hatterhat/autoloom 
i've been sitting on this a while but here have the AUTOLOOM
 2021-10-27 05:13:40 -07:00
silicons
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal 
Removes minesweeper
 2021-10-27 05:11:48 -07:00
WanderingFox95
4b13d1772c [Ready] Bone Anvil and processable Bone ingots (#15290) 
* Adding all the extra stuff

* whoops, slipped my last fix in here.

* bone balance

* 6 Goliaths + 3 Watchers + 1 Legion

* bumps the damage modifier down to 1.05

* More Bones.

* Undoes the undoing of the other fix PR

Co-authored-by: Emily <null>
 2021-10-25 18:11:54 +02:00
keronshb
ff9439d223 Dsword Wound and slowdown fix 2021-10-22 23:04:19 -04:00
SandPoot
45ef0fe5ca closes #15278 2021-10-17 21:40:39 -03:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
Hatterhat
7e7a5af53a brought to you by neilcic - Floor Corn 2021-10-16 05:00:15 -05: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
keronshb
e5f66413c8 fat dart 
no idea what this even is
 2021-10-08 17:28:25 -04:00
Putnam3145
fedf409a5d Merge pull request #15105 from Citadel-Station-13/silicons-patch-7 
comedically controversial stunbaton """"buff""""
 2021-10-07 00:05:45 -07:00
Putnam3145
8be5dba86a Merge pull request #15127 from Citadel-Station-13/silicons-patch-14 
chaplain runspeed holy weapon will now only give a random slowdown/speedup of 6 tiles which for the most part ignores all other slowdowns/speedups, instead of randomizing between slowing to a crawl and running faster than the speed of light
 2021-10-07 00:05:24 -07:00
Chayse Ramsay
76fa85e683 Cyborg module sorting fixed (#15241) 2021-10-06 17:16:10 +02: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
Lin
8f9a2b6d0c Merge pull request #15235 from silicons/pai_radio_Stuff 
redoes how pai emp silencing works
 2021-10-05 12:32:23 -07:00
Lin
b18fbe695a Merge pull request #15233 from SandPoot/misc-fixes 
Some random fixes
 2021-10-05 10:27:19 -07:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
silicons
bac7bc3fb6 fix 2021-10-03 11:29:32 -07:00
SandPoot
1c80169f22 Update shields.dm 2021-10-02 22:35:54 -03:00
SandPoot
95b814d47e Upload files 2021-10-02 22:29:01 -03:00
Putnam3145
dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
WanderingFox95
83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
raspy-on-osu
c7020972ae init 2021-09-28 21:09:34 -04:00
silicons
5ff4a2ace5 Merge pull request #15180 from LetterN/achives- 
Achivement & Clowncar update
 2021-09-28 00:15:52 -07:00
WanderingFox95
d8aa29a16e Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-21 14:49:15 +02:00
Lin
ab7b4e3eec Merge pull request #15181 from Citadel-Station-13/typecaches 
no more powergaming dice bags
 2021-09-20 23:59:53 -05:00
WanderingFox95
c99df01c87 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-20 00:16:27 +02:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
zerothebigboy
c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-09-19 15:23:52 -04:00
silicons
8d914571e8 Merge pull request #15094 from zeroisthebiggay/patch-20 
removes building (fortnite) windows
 2021-09-19 11:09:55 -07:00
silicons
a40acd3cd6 Merge pull request #15176 from buffyuwu/dogborgsleeper 
fixes dogborg sleepers not working
 2021-09-19 11:09:06 -07:00