shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,946 Commits 5 Branches 0 Tags
24ce9d4de7f07b46db4eb9b05cd91f980b7518ff
Commit Graph

29162 Commits

Author SHA1 Message Date
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
Putnam3145
ac84eed0d1 Merge pull request #15129 from Citadel-Station-13/silicons-patch-15 
if you recognize this is not the way to do it, don't do it (bandaid to polychromatic loadout lookup)
 2021-10-07 00:05:06 -07:00
keronshb
5451e5d4d7 Space Dragon gust no longer hardstuns. (#15243) 
* Removes hardstun

* oops adds the disarm
 2021-10-06 17:30:13 +02:00
Chayse Ramsay
d1611ddf42 Lavaland ruin rad storm fix (#15242) 
* Lavaland rad storm fix

* whoops

* double whoops

* Update Lavaland.dmm
 2021-10-06 17:28:29 +02:00
Tupinambis
383f4423ac Why can't xenos eat rats and stuff. This fixes that. (#15227) 2021-10-06 17:19:59 +02:00
Chayse Ramsay
76fa85e683 Cyborg module sorting fixed (#15241) 2021-10-06 17:16:10 +02:00
Lin
3f50e836cc Merge pull request #15238 from DeltaFire15/nanitedefibs 
Nanite defibs now heal oxygen damage akin to defibs, also adds the revival memory policy to them
 2021-10-05 16:25:59 -07: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
88db62f03f Merge pull request #15239 from jakeramsay007/7.12x82mm-Fix 
7.12x82mm Match Ammo box sprite fixed
 2021-10-05 12:21:10 -07:00
Lin
1b8c72285f Merge pull request #15236 from silicons/decon 
fixes computer boards disappearing on decon
 2021-10-05 12:14:00 -07:00
Lin
b18fbe695a Merge pull request #15233 from SandPoot/misc-fixes 
Some random fixes
 2021-10-05 10:27:19 -07:00
Chayse Ramsay
4d2e81d73c newline 2021-10-05 02:52:50 +01:00
Chayse Ramsay
6f0722ab48 Ammo box sprite fixed 2021-10-04 18:36:17 +01:00
DeltaFire
97eb42b35b defib policy hook & oxyheal 2021-10-04 15:49:12 +02:00
DeltaFire
cd570be827 woo 2021-10-04 15:03:56 +02:00
silicons
f5e52f810d I HATE YOU 2021-10-03 13:54:58 -07:00
silicons
715251dea1 wack 2021-10-03 13:25:30 -07:00
silicons
bac7bc3fb6 fix 2021-10-03 11:29:32 -07:00
silicons
f024318810 Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul 
Tribal Crafting Overhauled & Expanded
 2021-10-03 11:20:55 -07:00
silicons
31467420d7 Merge pull request #15221 from SandPoot/colormate 
Colormate tgui + minor tgui updates
 2021-10-03 08:51:51 -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
WanderingFox95
83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
Putnam3145
826ccbe40c Merge pull request #15214 from qweq12yt/grab-bag-bug-fixing 
[Fix] Grab bag bug fixing
 2021-09-29 18:56:17 -07:00
Putnam3145
a0a9089ce0 Removes "play on same board" from minesweeper (#15217) 2021-09-29 18:52:05 +02:00
SandPoot
b23b88524d Upload files 2021-09-28 22:03:17 -03:00
silicons
770942e35d Merge pull request #15199 from zeroisthebiggay/patch-26 
removes motivation player lock; halves the motivation's price; allows motivation to discount.
 2021-09-28 00:17:23 -07:00
silicons
5ff4a2ace5 Merge pull request #15180 from LetterN/achives- 
Achivement & Clowncar update
 2021-09-28 00:15:52 -07:00
silicons
cd579124cb Merge pull request #15188 from buffyuwu/clothingupdate1 
ports/adds more edited clothing
 2021-09-28 00:15:23 -07:00
silicons
06771cd47a Merge pull request #15189 from zeroisthebiggay/minkraft 
a new maintenance ambience
 2021-09-28 00:15:16 -07:00
silicons
f317e510f7 Merge pull request #15191 from keronshb/ninjaadjustment 
Puts the ninja status back into the status window and restores the energy charge meter.
 2021-09-28 00:14:42 -07:00
silicons
d6e7a096e6 Merge pull request #15206 from zeroisthebiggay/metaprison 
meta station prison remapping
 2021-09-28 00:13:13 -07:00
silicons
b7476491d3 Merge pull request #15204 from Hatterhat/clip-delay 
shotgun shell clips now have melee click delay (0.8s) with this one weird trick
 2021-09-28 00:13:02 -07:00
silicons
dd6e2d7240 Merge pull request #15202 from Hatterhat/saiga-ballin 
CCS stock safety
 2021-09-28 00:12:54 -07:00
silicons
3607bbf363 Merge pull request #15197 from Putnam3145/up-min-lavaland-temp 
Ups minimum lavaland temperature
 2021-09-27 23:31:20 -07:00
silicons
cefef5b0bc Merge pull request #15203 from zeroisthebiggay/buggers 
Fixing (cult) slurring and stuttering never going away from non-carbon mobs.
 2021-09-27 23:31:03 -07:00
qweq12yt
4e8b02dd75 restored the serving tray to the autholathes 2021-09-27 17:38:28 -03:00
qweq12yt
0bb9b23537 restore spray bottle sounds 2021-09-27 17:32:07 -03:00
qweq12yt
91a738fb9e fix canisters 2021-09-27 17:17:16 -03:00
Jordan Brown
2db0511d0d Removes a dead var 2021-09-27 12:20:37 -04:00
WanderingFox95
4e87044845 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-27 18:15:34 +02:00
Hatterhat
d3704b845c Merge branch 'master' into saiga-ballin 2021-09-26 21:41:00 -05:00
silicons
ec3fbed5bb Merge pull request #15205 from zeroisthebiggay/patch-28 
fixes code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used
 2021-09-26 13:30:40 -07:00
Lin
27aaaecb52 Merge pull request #15200 from zeroisthebiggay/patch-27 
fixes yet another emeraldsundisk map pr which was not spawning because the Ruin Didn't Actually Exist.
 2021-09-26 12:04:27 -05:00
silicons
6c00bb8dce Update living_blocking_parrying.dm (#15208) 2021-09-26 15:41:09 +02:00
zeroisthebiggay
be82bd310e Update plaguerat.dm 2021-09-25 19:17:43 -04:00
zeroisthebiggay
58df5b70bf Update plaguerat.dm 2021-09-25 19:09:22 -04:00
Hatterhat
e141df3600 weirdchamp 2021-09-24 23:16:46 -05:00
Hatterhat
fd6e97b935 grr 2021-09-24 23:08:15 -05:00