shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,008 Commits 5 Branches 0 Tags
4e69cf015159462bbbb534db9b87b71b5dac11f1
Commit Graph

13575 Commits

Author SHA1 Message Date
kevinz000
8fbdae375c Merge pull request #11494 from Detective-Google/hudpatches 
Adds craftable HUDpatches, similar to the HoS'
 2020-03-18 03:35:28 -07:00
kevinz000
c11275e4ba Update robot.dm (#11505) 2020-03-18 03:15:12 +01:00
Lin
1649f42570 bruh 2020-03-18 01:24:54 +00:00
Detective Google
6b392e09c2 Merge remote-tracking branch 'upstream/master' into hudpatches 2020-03-17 16:29:13 -05:00
Detective Google
af872d1476 push 2020-03-17 16:10:15 -05:00
kevinz000
fcf51a285d Merge pull request #11502 from Citadel-Station-13/Ghommie-patch-5 
Positronic overlays fix.
 2020-03-17 09:29:39 -07:00
kevinz000
7a9525d7c7 Merge pull request #11499 from Citadel-Station-13/Ghommie-patch-3 
Fixing right click / verb set_APTFT
 2020-03-17 09:29:17 -07:00
kevinz000
2ae50af752 Merge pull request #11487 from Ghommie/Ghommie-cit626 
Shortcut fix for a sticky situation.
 2020-03-17 09:28:01 -07:00
kevinz000
a928681401 Merge pull request #11503 from necromanceranne/45_nerf_kitchengun_buff 
Removes stun bullet .45/Kitchen Gun a lot more desirable for heavy duty cleaning!
 2020-03-17 09:25:51 -07:00
kevinz000
2e4282befa Merge pull request #11498 from necromanceranne/diaghud_fix 
Replaced and added missing Diagnostic HUDSunglasses sprites
 2020-03-17 09:25:32 -07:00
kevinz000
b062c76ca7 Merge pull request #11485 from Ghommie/Ghommie-cit625 
Fixing a little issue with the musician trait etcetera.
 2020-03-16 13:23:25 -07:00
kevinz000
2e90761f88 Merge pull request #11482 from Ghommie/Ghommie-cit624 
fixing missing icon issues for some survival pod machinery.
 2020-03-16 13:23:06 -07:00
kevinz000
fd7bfaba06 Merge pull request #11480 from Ghommie/Ghommie-cit623 
Banana pies, beams. runtime errors and warnings.
 2020-03-16 13:22:49 -07:00
kevinz000
3c97782a87 Merge pull request #11483 from Hatterhat/mining-borg-nerfs 
mining borg nerfs - "they should be outclassed lategame"
 2020-03-16 13:22:23 -07:00
necromanceranne
6f0fc2bdea I LOVE YOU KITCHEN GUN! 2020-03-17 03:20:53 +11:00
Seris02
ffb2e65c17 why I hate byond (#11496) 2020-03-16 17:20:51 +01:00
Ghom
a505806ef2 No comment. 2020-03-16 17:13:56 +01:00
Ghom
a24a67e489 Update reagent_containers.dm 2020-03-16 17:07:30 +01:00
Ghom
be8f5e1193 Update posibrain.dm 2020-03-16 17:05:12 +01:00
Ghom
75a84c06b1 Update MMI.dm 2020-03-16 17:04:29 +01:00
Ghom
d47c24a8d0 Fixing right click / verb set_APTFT 2020-03-16 16:44:15 +01:00
necromanceranne
19fd006103 Fixed some missing sprites 2020-03-17 02:12:28 +11:00
kevinz000
8fdb1e5964 Merge pull request #11465 from Seris02/duffelbagholding 
duffel bags of holding
 2020-03-16 06:12:40 -07:00
Detective Google
828b5cdacf why was this backwards 2020-03-16 01:57:23 -05:00
Detective Google
94f694e568 adds some hudpatches 
seemed like fun flavor, inspired by bay and a request.
 2020-03-16 01:44:26 -05:00
Hatterhat
1fe67d5ce9 a finger of the monkey's paw curls. 2020-03-16 01:35:47 -05:00
kevinz000
fae84f9ee6 Merge pull request #11462 from Ghommie/Ghommie-cit621 
Fixing some bug reports.
 2020-03-15 23:03:59 -07:00
Ghommie
5e5bdec85d More runtime errors. 2020-03-16 01:55:02 +01:00
Ghommie
2553384c6e Shortcut fix for a sticky situation. 2020-03-16 01:23:12 +01:00
Ghommie
8af3d0e2fa Fixing a little issue with the musician trait etcetera. 2020-03-16 00:09:03 +01:00
Hatterhat
802d37a399 borgs should be outclassed lategame and not hunt 2020-03-15 15:55:31 -05:00
kevinz000
339ea13e00 Update beam_rifle.dm (#11477) 2020-03-15 20:54:23 +01:00
Ghommie
0ce0265420 fixing missing icons for survival pod machinery. 2020-03-15 20:47:37 +01:00
Ghom
4020c67956 Update snacks_pie.dm 2020-03-15 16:16:28 +01:00
Ghommie
b453a25e14 Something about banana pies, runtime errors and warnings. 2020-03-15 15:41:32 +01:00
Ghommie
5bfbcd0948 Fixing some GetElement runtimes. 2020-03-15 15:12:35 +01:00
kevinz000
b7c3ada3e5 nuclear fixes the blindness issue by making eye_blind() max() rather than add (#11438) 
* Update status_procs.dm

* Update status_procs.dm

* travis

* aight bet
 2020-03-15 13:08:52 +01:00
Ghom
d8a6e9b94f Merge branch 'master' into Ghommie-cit621 2020-03-15 13:07:45 +01:00
kevinz000
2139bfdb5f Merge pull request #11290 from Putnam3145/traitor-types 
Traitor classes: a new paradigm.
 2020-03-15 01:35:30 -07:00
kevinz000
0b809dd9ec Merge pull request #11455 from Trilbyspaceclone/patch-309 
Nerfs paper work - Again
 2020-03-14 22:22:16 -07:00
kevinz000
195a3b593b Merge pull request #11458 from Trilbyspaceclone/patch-310 
Buffs borg hypos - Anti-radiation addition
 2020-03-14 22:21:32 -07:00
kevinz000
2de1395e6b Merge pull request #11471 from Citadel-Station-13/Ghommie-patch-1 
Webedit fixing electrocute_act stuns.
 2020-03-14 21:49:36 -07:00
Kraseo
bee11a2ee5 no i am not testing if mice can chew wires if they're in a stomach now shut the fuck up (#11460) 2020-03-15 04:04:35 +01:00
Kraseo
d34d46f00d i think you're a thief cause you stole my heart, stole my heart, trapped my soul like azura's star (#11461) 2020-03-15 04:03:50 +01:00
Ghom
06d641b46a Webedit fixing electrocute_act stuns. 2020-03-14 21:19:09 +01:00
kevinz000
7a27baa699 Merge pull request #11450 from zeroisthebiggay/timefornekerchiefsuwu 
ports ([READY] Allows bandannas to be worn as neckerchiefs. #40125) from TG code
 2020-03-14 09:12:12 -07:00
kevinz000
0953ec19e5 Merge pull request #11453 from necromanceranne/I_am_at_high_risk_of_stroke 
I'm pretty sure this was causing people to bleed out from light hits
 2020-03-14 09:11:38 -07:00
kevinz000
a21458bba6 Merge pull request #11437 from keronshb/BlobBuffPort 
Ports Blob Buffs
 2020-03-14 09:10:54 -07:00
kevinz000
395fa32136 Merge pull request #11447 from Ghommie/Ghommie-cit618 
Porting datum components system updates.
 2020-03-14 09:09:50 -07:00
kevinz000
a35049fc94 Merge pull request #11448 from Ghommie/Ghommie-cit619 
Makes the autotransfer subsystem slightly more modulable.
 2020-03-14 09:09:11 -07:00