Commit Graph

14466 Commits

Author SHA1 Message Date
kevinz000 c35ffacf50 k 2020-03-16 04:29:18 -07:00
kevinz000 763c835a53 bitflags not equals 2020-03-16 04:26:19 -07:00
kevinz000 2a9e4bebdd priority 2020-03-16 04:24:18 -07:00
kevinz000 69374c64c9 k 2020-03-16 04:18:22 -07:00
kevinz000 857f793600 ok 2020-03-16 04:12:54 -07:00
kevinz000 644273beca k 2020-03-16 04:09:25 -07:00
kevinz000 94db06509c slight desword reflect meme buff 2020-03-16 03:50:26 -07:00
kevinz000 d32bff7815 return list 2020-03-16 03:35:10 -07:00
kevinz000 703fca5f90 add owner argument 2020-03-16 03:24:19 -07:00
kevinz000 9ead492bb0 changes 2020-03-16 00:28:18 -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
Ghommie 312ef1d961 Merge branch 'Ghommie-cit616' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:38:42 +01:00
Ghommie ea30b2fb1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:35:59 +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
kevinz000 4d0677daa9 s 2020-03-14 21:48:23 -07:00
kevinz000 2113b63428 o boy 2020-03-14 21:42:23 -07:00
kevinz000 1a061a5d3e agony 2020-03-14 21:14:56 -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
Seris02 48076c921d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers 2020-03-14 11:41:39 +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