shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,780 Commits 5 Branches 0 Tags
8ec4bdaef5af38676eb3634fdbdbce89d807e76f
Commit Graph

10978 Commits

Author SHA1 Message Date
Ghommie
8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. 2019-12-13 02:30:11 +01:00
BlackMajor
725414bd03 Merge pull request #9894 from Putnam3145/real-explosion-fix 
[TESTMERGE] Explosion/bomb armor rework
 2019-12-13 10:20:33 +13:00
Putnam3145
71b2754aa6 Merge pull request #10121 from kappa-sama/patch-12 
plasmafist wizard plasmafist wizard
 2019-12-12 12:28:49 -08:00
Putnam3145
9234876ad1 Merge pull request #10156 from Ghommie/Ghommie-cit451 
Fixing character setup preview icons.
 2019-12-12 09:30:34 -08:00
Ghommie
3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01:00
Lin
a4d52454db Merge pull request #10085 from Ghommie/Ghommie-cit440 
Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago.
 2019-12-12 02:13:54 +00:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2019-12-10 23:52:31 +00:00
BlackMajor
8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329 
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
 2019-12-10 11:18:55 +13:00
Putnam3145
ee65d93e5a Merge pull request #10086 from Ghommie/Ghommie-cit441 
Fixes AI core display I may have broken with my coding extravaganza.
 2019-12-09 13:41:25 -08:00
Putnam3145
5522b3d11d Merge pull request #10037 from Ghommie/Ghommie-cit421 
Doubles locomotion circuit ext cooldown. Nerfs gun & pneumatic cannons circuits with sanity checks.
 2019-12-09 13:34:23 -08:00
Putnam3145
c54523e324 Merge pull request #9629 from Citadel-Station-13/kevinz000-patch-87 
can we not tell all the nonantags that antagonist ooc is enabled please
 2019-12-09 13:25:37 -08:00
Putnam3145
975a40cadf Merge pull request #10094 from Trilbyspaceclone/patch-242 
Fixes eletroplating of brozne/golden tool box
 2019-12-09 13:23:13 -08:00
Putnam3145
739f873ca6 Merge pull request #10132 from Trilbyspaceclone/patch-243 
Makes meat hook fit in boh again
 2019-12-09 13:08:12 -08:00
Putnam3145
beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429 
Fixes some means of eyes blindness not working, removes legacy code.
 2019-12-09 12:40:37 -08:00
Trilbyspaceclone
7c4fab127f Update necropolis_chests.dm 2019-12-09 15:37:22 -05:00
Putnam3145
01bb9d79d9 Merge pull request #10114 from r4d6/n2o-pressure-tank 
Add a N2O Pressure Tank
 2019-12-09 12:33:03 -08:00
kappa-sama
f790d675d9 flavor text 2019-12-09 09:06:11 -05:00
kappa-sama
e111429a30 the hippie thing 2019-12-08 23:37:33 -05:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Lin
ef01bbd222 Merge pull request #10075 from Ghommie/Ghommie-cit436 
Demodularize defib disks and projectiles icons.
 2019-12-08 20:15:01 +00:00
Lin
9c7ac9a469 Merge pull request #10071 from Ghommie/Ghommie-cit434 
Fixes bubblegum's death not unlocking the arena shuttle buyment since the medals subsystem is not hub enabled
 2019-12-08 20:01:50 +00:00
r4d6
2eca1657ab Add a N2O Pressure Tank 2019-12-08 08:54:50 -05:00
Lin
24e4673c2b Merge pull request #10057 from Ghommie/Ghommie-cit431 
fixes on_mob eyes overlays not updating properly in certain cases.
 2019-12-07 21:49:18 +00:00
Thalpy
f59bdbe14e Tweaks botany related ragent pHes so they're less likely to blow up. 2019-12-07 17:42:29 +00:00
Putnam3145
cece6dd43d Merge pull request #10098 from Ghommie/Ghommie-cit445 
Fixes a lil issue with ice cream cones.
 2019-12-07 08:48:21 -08:00
Ghommie
d38475f06d i'm tired of this 2019-12-07 12:05:12 +01:00
Trilbyspaceclone
156b7cabb1 Update recipes_misc.dm 2019-12-07 04:41:28 -05:00
kevinz000
c706720dd1 Merge pull request #9912 from Owai-Seek/cargocleanupv2boogaloo 
Added 15+ new crates, fixed issues raised in #9901
 2019-12-07 01:52:35 -07:00
Trilbyspaceclone
7ab66fd2e2 no wounder why I didnt push it, it never complied 2019-12-07 03:50:20 -05:00
Trilbyspaceclone
6faad2e30b Update recipes_misc.dm 2019-12-07 03:46:25 -05:00
Ghommie
7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
Ghommie
0a0094e80c Fixes stuff I broke with my coding extravaganza. 2019-12-07 05:11:29 +01:00
Ghommie
9152fe49e6 Typo. 2019-12-07 04:49:18 +01:00
Ghommie
b9751006bb Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago. 2019-12-07 04:46:54 +01:00
nik707
e4a41c6169 Merge pull request #9932 from Putnam3145/fix-genital-contam 
Make organs no longer radiaoctively contaminable.
 2019-12-06 20:37:53 -06:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Ghommie
2addcb4142 Fixes bubblegum's death not granting the arena shuttle because the medals subsystem is not hub enabled 2019-12-06 16:37:46 +01:00
Winter Flare
6377f1b3a9 Organisation 2019-12-06 03:42:57 -05:00
kevinz000
968e9c099d Update silicon.dm 2019-12-06 01:12:44 -07:00
Winter Flare
8bd6c58bcd Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:27:44 -05:00
Winter Flare
b860c6e0bb Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:14:44 -05:00
Winter Flare
83b77650a8 Additional Cleanup 
Reorganised Materials, added Bulk Cotton Crate
Removed Wooden Barrel / Toner Crates
Modified Fruit Delux Crate
Modified Cargo Supplies Crate
Moved several crates to their proper areas.
 2019-12-06 01:13:54 -05:00
Putnam3145
4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430 
Ports "Slightly improves visible and audible messages."
 2019-12-05 21:16:47 -08:00
kevinz000
6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394 
Updating supply pods code.
 2019-12-05 21:54:42 -07:00
Putnam3145
6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
kevinz000
90f31f5b2b Merge pull request #10023 from Sishen1542/i 
meteors now only give 60-90 seconds warning
 2019-12-05 21:52:32 -07:00
kevinz000
54be35a243 Merge pull request #9997 from Sishen1542/nuked 
removes superspeed from nuka cola
 2019-12-05 21:48:34 -07:00
Putnam3145
3633c6936d Merge pull request #10052 from Ghommie/Ghommie-cit428 
Banishes some "me" emote magic numbers from this realm.
 2019-12-05 20:47:39 -08:00
kevinz000
b932841adf Merge pull request #9975 from Ghommie/Ghommie-cit404 
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
 2019-12-05 21:47:29 -07:00
Putnam3145
62c0d59102 Merge pull request #10008 from Seris02/sleepingcarphallucination 
adds sleeping carp wrist wrench/violent grab hallucination
 2019-12-05 20:46:26 -08:00