shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,279 Commits 5 Branches 0 Tags
a395fc1b520d83cfb069936e58ec7744d58ae71b
Commit Graph

19064 Commits

Author SHA1 Message Date
zerothebigboy
a395fc1b52 a 2021-06-12 19:58:53 -04:00
BlackMajor
86881dc1af Merge pull request #14768 from Citadel-Station-13/silicons-patch-33 
makes xenos immune to stamina damage, with something that might be potentially horrifically abusable but isn't really fixable in a clean way yet
 2021-06-11 12:52:12 +12:00
silicons
5e4f3ed694 Merge pull request #14683 from keronshb/shovedisarmgun 
Off Balance Disarms only if shoved into a wall or person.
 2021-06-09 12:14:37 -07:00
silicons
09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon 
New Challenger: The Cat Surgeon has appeared! (Ready!)
 2021-06-09 11:29:24 -07:00
silicons
a77aa8bd41 Merge pull request #14766 from Linzolle/cultfix 
Fix cult area shenanigans, cult can do stuff in maint again.
 2021-06-09 11:22:26 -07:00
silicons
224efa0e26 Merge pull request #14762 from DrPainis/patch-2 
adds cat meteors
 2021-06-09 11:21:55 -07:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport 
Ports Floor Cluwnes and Cluwnes.
 2021-06-09 11:21:22 -07:00
silicons
996a99b7f4 Merge pull request #14759 from Arturlang/uplink_misc_item_rebalances 
Changes the cost of the holoparasite injector and the ricochet eyepatch
 2021-06-09 11:21:12 -07:00
silicons
a56ac3ce07 Merge pull request #14749 from DrPainis/patch-14 
adds goliath calamari (currently untested because Forget™)
 2021-06-09 11:20:49 -07:00
silicons
30e7939e0e Merge pull request #14771 from keronshb/disposalcargo 
Lets the Cargo Shuttle use Disposal Pipes again
 2021-06-09 11:19:40 -07:00
silicons
dcd80edf5f Merge pull request #14806 from zeroisthebiggay/patch-11 
cuts the amount of essence revenant objective needs in half so it is actually feasibly possible
 2021-06-09 11:17:52 -07:00
silicons
7af470efef Merge pull request #14808 from SandPoot/fixes-soulstones 
Fixes soulstones runtiming
 2021-06-09 11:17:25 -07:00
silicons
c7df74f452 Merge pull request #14810 from zeroisthebiggay/patch-12 
Clowncar exploit fix
 2021-06-09 11:17:17 -07:00
silicons
ec63a4c62b Merge pull request #14779 from Arturlang/Orbit_menu_antags 
Makes orbit menu show antags if DNR
 2021-06-09 11:17:14 -07:00
silicons
3d86ce9bda Merge pull request #14787 from WanderingFox95/WanderingFox95-ORV-Revamp 
ORV Uniform Revamp
 2021-06-09 11:17:06 -07:00
silicons
2402c56bfc Merge pull request #14805 from bunny232/hydroslimejelly 
Hydroponics slimejelly recipe from tg
 2021-06-09 11:15:36 -07:00
silicons
c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes 
Centralizes borg speech and uses some of the icons for the typing indicator
 2021-06-09 11:15:01 -07:00
silicons
259aed7903 Merge pull request #14783 from DeltaFire15/spec-species-color 
Colors species names depending on traits
 2021-06-09 11:14:48 -07:00
silicons
7963dce24e Merge pull request #14712 from keronshb/hereticadjustments 
Minor Heretic rework and fixes (Includes shifting realities and more)
 2021-06-09 11:12:23 -07:00
silicons
716c2a04e4 Merge pull request #14160 from keronshb/motivation 
Adds a new traitor item, Motivation (Part 1)
 2021-06-09 11:10:17 -07:00
zeroisthebiggay
082ffa16f3 Update car.dm 2021-06-08 15:43:32 -04:00
SandPoot
b0940456f5 upload files 2021-06-08 13:13:22 -03:00
SandPoot
00bb96d467 upload soulstone.dm 2021-06-08 12:32:12 -03:00
zeroisthebiggay
536135ec02 last bit of finetuning 2021-06-08 01:17:10 -04:00
zeroisthebiggay
55075fb31b Update revenant.dm 2021-06-08 01:15:03 -04:00
zeroisthebiggay
538f1c802d Update revenant.dm 2021-06-08 01:13:12 -04:00
bunny232
1a72070f5c slimejelly 
a
 2021-06-07 21:44:33 -04:00
Lin
27d7b4b564 Merge pull request #14793 from bunny232/pool-fog 
Pools now get misty at warm insteaed of scalding
 2021-06-05 16:26:21 -05:00
WanderingFox95
7884ccf316 Only 5 units are necessary, so why keep it at 10? 
I mean, this is the refining process
 2021-06-05 14:51:59 +02:00
keronshb
40f9941849 Fixes invisibility when being dragged and glass table cheese 2021-06-04 22:52:03 -04:00
Lin
5f6cb40d16 Merge pull request #14773 from Putnam3145/fix-activity-typo 
Fixes an activity display issue
 2021-06-04 21:37:42 -05:00
Putnam3145
b757e22956 Merge pull request #14763 from zeroisthebiggay/dogears 
adds floppy dog ears that aren't obscenely dark
 2021-06-04 15:37:57 -07:00
bunny232
720966f31e Misty~ 2021-06-03 19:10:46 -04:00
Lin
c2c2825027 Merge pull request #14772 from Putnam3145/fix-sniper-bad 
Makes sniper zooming work
 2021-06-02 21:50:33 -05:00
DeltaFire
b2e2c49011 plasmamen & golems 2021-06-02 17:47:57 +02:00
WanderingFox95
015bd3c338 Armor for security armor and a small fix 2021-06-02 17:22:46 +02:00
WanderingFox95
5c827d9796 Bit of that 2021-06-02 15:28:46 +02:00
DeltaFire
0f01a4a7da huh 2021-06-01 22:52:39 +02:00
DeltaFire
dd33371a3b colors 2021-06-01 22:48:57 +02:00
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
Arturlang
84db564e0f Prettier? code 2021-06-01 02:25:06 +03:00
Arturlang
4b541d3dac phonecode 2021-06-01 02:21:33 +03:00
silicons
cb52be5dd9 fixes linter warnings (#14778) 
* woo

* woo
 2021-05-31 10:19:20 -05:00
Artur
8687312935 Makes orbit menu show antags if DNR 2021-05-31 18:14:06 +03:00
WanderingFox95
e69729beb4 So he doesn't need sodium thiopental after all. 
Turns out Furranium has a knockdown.
 2021-05-31 12:15:16 +02:00
WanderingFox95
249d23a6cc Fixed something with the event 2021-05-31 09:52:31 +02:00
WanderingFox95
2516afbbba Cat Surgeon Event 
If I did it right, thanks Keron!
 2021-05-31 00:41:59 +02:00
WanderingFox95
ae2970f318 Adds a special Catranq Dart 2021-05-30 21:17:03 +02:00
WanderingFox95
df0e1057d1 Imagine this crazy person became a threat suddenly 2021-05-30 21:15:44 +02:00
Putnam
0dc1163a29 adds a sorely needed line break 2021-05-30 00:44:02 -07:00