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

29133 Commits

Author SHA1 Message Date
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
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
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
zerothebigboy
3e1f5326e3 buggers 2021-09-24 22:25:53 -04:00
Lin
c991a3004a Merge pull request #15192 from buffyuwu/accordion 
ports a downstream fix of accordions
 2021-09-24 19:14:14 -05:00
Hatterhat
784cd2ca7d ballin 2021-09-24 19:12:04 -05:00
zeroisthebiggay
72cb19eb3f Update space.dm 2021-09-24 19:15:32 -04:00
zeroisthebiggay
c633c95919 Update space.dm 2021-09-24 18:35:49 -04:00
zeroisthebiggay
662807042d Update uplink_dangerous.dm 2021-09-23 22:14:09 -04:00
WanderingFox95
9464ad8061 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-24 00:59:57 +02:00
zeroisthebiggay
7ba7f0d1c1 gremlins become shock immune (#15183) 
* Update gremlin.dm

* Update gremlin.dm
 2021-09-23 19:20:15 +02:00
Putnam3145
a4adf41c7c Ups minimum lavaland temperature 2021-09-22 18:43:45 -07:00
Lin
f8ac9af6d0 Merge pull request #15187 from KrabSpider/krabgenics 
blacklists cryogenics from anomaly spawns
 2021-09-22 14:50:28 -05:00
Lin
4e9e98367f Merge pull request #15190 from buffyuwu/canvas 
adds art supplies to the fun vendor
 2021-09-22 14:49:57 -05:00
buffyuwu
2522b84667 ports a downstream fix of accordions 
while fixing this downstream at fortuna i realized we hadn't fixed this upstream whee
 2021-09-22 01:56:13 -04:00
keronshb
271047cf9f Ninja Change 2021-09-21 17:42:02 -04:00
WanderingFox95
d8aa29a16e Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-21 14:49:15 +02:00
buffyuwu
dbd6014129 adds art supplies to the fun vendor 
because some maps don't have the canvas/easel

🆑
add: canvas and spraycan are now sold in the fun vendor
/🆑
 2021-09-21 01:16:03 -04:00
Lin
ad4cb7ea0e Merge pull request #15182 from Citadel-Station-13/silicons-patch-3 
reverts my limb damage changes
 2021-09-21 00:00:20 -05: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
Lin
a084733397 Merge pull request #15179 from Citadel-Station-13/why 
adds policy configs for elite fauna and prisoner role
 2021-09-20 23:58:21 -05:00
Lin
7a5e748344 Merge pull request #15185 from Citadel-Station-13/silicons-patch-6 
fixes airlock deflection
 2021-09-20 23:53:53 -05:00