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

10997 Commits

Author SHA1 Message Date
kevinz000
a4ffef5b1f Typos 2019-12-15 00:36:20 -07:00
kevinz000
297c909b76 resting stuff 2019-12-15 00:29:18 -07:00
kevinz000
586dcb6f81 welp i got lazy 2019-12-15 00:15:32 -07:00
kevinz000
4970675467 s 2019-12-15 00:06:11 -07:00
Putnam3145
2e9503f6d7 Merge pull request #10166 from Ghommie/Ghommie-cit457 
Ports "Roundstart borg brains no longer decay."
 2019-12-14 20:37:57 -08:00
Lin
cce63507d1 Merge pull request #9970 from Ghommie/Ghommie-cit402 
they're pretty bad, I'm not sure how these actually got in actually. thanks kevin
 2019-12-15 00:16:34 +00:00
Lin
49c37641a7 Merge pull request #10122 from Citadel-Station-13/kevinz000-patch-124 
nerfs factorio (conveyors can no longer stack more than 150 items on one tile)
 2019-12-15 00:04:58 +00:00
Lin
1f852ea92a Merge pull request #10150 from Trilbyspaceclone/patch-245 
Corrects telegram hat icon, adds a new dog fashion to telegram hat
 2019-12-15 00:02:57 +00:00
Putnam3145
bd1040ab60 Merge pull request #10171 from r4d6/patch-1 
Who the fuck put 10 shielding when you need 9?
 2019-12-14 11:04:37 -08:00
kevinz000
659b78d8b8 Merge pull request #10162 from BlackMajor/Yeehaw 
Removes medihounds (actually just makes them a medical aux sprite)
 2019-12-13 16:52:22 -07:00
r4d6
5f95e0d5a6 Remove an extra antimatter engine shielding 2019-12-13 08:17:06 -05:00
Ghommie
2611023488 Ports "Roundstart borg brains no longer decay." 2019-12-13 07:33:45 +01:00
nik707
cdeb4733aa Merge pull request #9863 from BlackMajor/Yote 
No adrenals for borgs please
 2019-12-12 23:50:34 -06:00
Ghommie
79328012b0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402 2019-12-13 03:41:22 +01:00
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13: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
kevinz000
ded283fa55 Update conveyor2.dm 2019-12-11 14:41:58 -07:00
Trilbyspaceclone
a7c8fb6470 corrects/adds a new dog fashion to telegram hat 2019-12-11 12:43:07 -05: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
kevinz000
20defaba8e Update conveyor2.dm 2019-12-08 21:46:53 -07: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