shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,943 Commits 5 Branches 0 Tags
2e90761f88983ac6fa6eb3f84e4dfab05abdbf42
Commit Graph

13552 Commits

Author SHA1 Message Date
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
Seris02
ffb2e65c17 why I hate byond (#11496) 2020-03-16 17:20:51 +01:00
kevinz000
8fdb1e5964 Merge pull request #11465 from Seris02/duffelbagholding 
duffel bags of holding
 2020-03-16 06:12:40 -07: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
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
Seris02
5a04b43db4 duffel baaaaaaaaaaags 2020-03-14 16:12:17 +08:00
Putnam3145
d9dc91db1a More dynamic fixes (#11451) 
* Fixed wizard, malf AI

* changed memes typename to story

* Fixed a bunch of really weird execute/ready confusion

* Added dynamic requirement to wands.
 2020-03-14 02:49:25 +01:00
Ghommie
1d51ac5ff2 Fixing some bug reports. 2020-03-14 02:34:25 +01:00
Trilbyspaceclone
888f67c4bc Update borghydro.dm 2020-03-13 18:21:12 -04:00
Trilbyspaceclone
487c18cb7e Update misc.dm 2020-03-13 14:20:28 -04:00
necromanceranne
49c0aba205 bleeding out from a toolbox smack is not cool gamers 2020-03-14 04:25:12 +11:00
ZeroMan
3fa39fd7ab i hate my ocd 2020-03-12 20:57:41 -04:00
ZeroMan
f5ec7f5b65 it works it works 2020-03-12 20:47:35 -04:00
Putnam
b1a94f7667 Made hijack, martyr more common 2020-03-12 15:05:53 -07:00
Putnam
ae94083dbe Added more explanation to hijack. 2020-03-12 14:59:04 -07:00
Ghommie
da5b293033 underscores. 2020-03-12 21:31:17 +01:00
Ghommie
663a849afe Makes the autotransfer subsystem a bit more optional. 2020-03-12 21:02:34 +01:00
Ghommie
0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000
bbd69c407c Merge pull request #11431 from Citadel-Station-13/Ghommie-patch-1 
Missing contractor tablet icon state fix
 2020-03-12 09:49:50 -07:00
kevinz000
78aa46d8de Merge pull request #11416 from Trilbyspaceclone/patch-306 
Makes Bluespace and Urianium reagents be able to be turned into sheets
 2020-03-12 09:49:26 -07:00
Trilbyspaceclone
b4f57a8885 Update others.dm 2020-03-12 10:56:25 -04:00
Ghom
442eb13e75 Merge pull request #11425 from Citadel-Station-13/kevinz000-patch-3 
fixes synthflesh/rezadone dehusk threshold check
 2020-03-12 14:20:49 +01:00
Ghom
9e3a3dddfd Merge pull request #11429 from Putnam3145/dynamic-tweaks 
Dynamic tweaks/fixes
 2020-03-12 14:20:28 +01:00
Ghom
c771471895 Merge pull request #11406 from kevinz000/minimaps 
Ports station minimaps from Yogstation thank you monster860 you are an epic gamer
 2020-03-12 14:18:39 +01:00
kevinz000
14b22f0b67 Merge remote-tracking branch 'citadel/master' into minimaps 2020-03-11 17:32:15 -07:00
kevinz000
3ae8016ec8 Merge pull request #11373 from kappa-sama/supershotty 
miner powercreep starring 150 damage pointblank shotgun
 2020-03-11 17:27:22 -07:00
kevinz000
54713dc1e4 Merge pull request #11408 from necromanceranne/sleeping_carp_port 
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
 2020-03-11 17:26:33 -07:00
kevinz000
b8642c5622 Merge pull request #11424 from necromanceranne/death_coma_stuff 
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
 2020-03-11 17:24:03 -07:00