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

17180 Commits

Author SHA1 Message Date
BlackMajor
8ce9dcc471 Merge pull request #10082 from Citadel-Station-13/kevinz000-patch-122 
Bluespace launchpad QoL (read: powercreep)
 2019-12-10 11:16:59 +13:00
BlackMajor
716df40d7a Merge pull request #10083 from Ghommie/Ghommie-cit439 
Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter.
 2019-12-10 11:15:56 +13:00
Putnam3145
0a8dcc3712 Merge pull request #10113 from Ghommie/Ghommie-cit448 
Fixes a long lasting runtime with filter data sorting.
 2019-12-09 13:49:41 -08: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
12003e8f59 Merge pull request #10130 from kappa-sama/patch-13 
unmodularize hulk
 2019-12-09 13:40:52 -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
f33d4b3d18 Merge pull request #10108 from DeltaFire15/cbt-critical-fix 
Screaming no longer is a viable strategy against clockies
 2019-12-09 13:07:02 -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
Artur
488c0f1833 Mindshield fix and thrall buff 2019-12-09 19:08:42 +02:00
kappa-sama
eb638adfa9 yw ghom 2019-12-09 10:10:14 -05: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
Lin
7794cea49c Merge pull request #9538 from Citadel-Station-13/kevinz000-patch-99 
Brings the combat back in combat defibrillator (DOES NOT BUFF CMO DO NOT YELL AT ME)
 2019-12-09 04:33:23 +00:00
kevinz000
3cacb998dd Merge pull request #9903 from PersianXerxes/removeFreeNVG 
Removes the night vision quirk
 2019-12-08 19:37:06 -07:00
kevinz000
9869c1c440 Merge pull request #10099 from Ghommie/Ghommie-cit446 
Fixes a few holo barriers lacking transparency.
 2019-12-08 19:05:10 -07: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
6368f04f2d Merge pull request #10044 from Ghommie/Ghommie-cit423 
Made wooden cabinet/closets... actually made of wood.
 2019-12-08 22:18:15 +00:00
Artur
d184bdd77a Whoops 2019-12-08 22:22:30 +02: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
Artur
9773b530f8 More fixes. Urgh 2019-12-08 21:47:25 +02:00
Useroth
1d0438800e Touched up a copy-paste leftover. 2019-12-08 17:04:11 +01:00
Useroth
ea4f57beb6 Spaghettid my way around the errors. 2019-12-08 16:47:21 +01:00
kevinz000
83ab577a6a Update launchpad_control.dm 2019-12-08 07:30:05 -07:00
r4d6
2eca1657ab Add a N2O Pressure Tank 2019-12-08 08:54:50 -05:00
Useroth
5e836c51e4 Forgot to track the new files 2019-12-08 14:05:05 +01:00
Useroth
a37f2de71d First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs. 2019-12-08 14:00:08 +01:00
Ghommie
a9335aa946 Fixes a long lasting runtime with filter data sorting. 2019-12-08 13:21:29 +01:00
kappa-sama
cdda28f85c tabs 2019-12-08 03:54:55 -05:00
kappa-sama
48be47d4d1 yes? 2019-12-08 03:54:29 -05:00
kappa-sama
52a050e9ee maybe 2019-12-08 03:54:02 -05:00
kappa-sama
b015d2571a ==? 2019-12-08 03:51:36 -05:00
kappa-sama
10c844e70d does this even work 2019-12-08 03:36:09 -05:00
DeltaFire
c0433ec944 I scream 
why can't I read
 2019-12-08 04:25:37 +01:00
DeltaFire
59e97989c0 I scream 
Hnnnnngh
 2019-12-08 04:20:04 +01:00
DeltaFire
88acc15fe5 scream if you want, it won't help you. 
Removes oxydamage from the "did you take damage" calculation for stuntime reduction
 2019-12-08 03:46:55 +01:00
Lin
a91139c470 Merge pull request #10068 from Ghommie/Ghommie-cit433 
Ports "Makes the windup toolbox more similar to His Grace".
 2019-12-07 21:52:10 +00: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
Useroth
c35acf00fe Empty commit to make travis recompile. 2019-12-07 15:18:37 +01:00
Artur
4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Useroth
28ddfd29b6 Merge branch 'master' into new-tg-plants 2019-12-07 14:25:38 +01:00
Ghommie
95cc84e69e Fixes a few holo barriers' transparency. 2019-12-07 12:13:33 +01:00