Commit Graph
35192 Commits
Author SHA1 Message Date
Aurorablade d423ba9b7d redoes corset utterly 2017-07-26 01:34:52 -04:00
Aurorablade 04d4244b90 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Clothes 2017-07-26 00:07:24 -04:00
ParadiseSS13-Bot 9c12b68430 Automatic changelog compile, [ci skip] 2017-07-25 17:40:30 -04:00
tigercat2000andGitHub 26ca00714e Merge pull request #7873 from Fox-McCloud/theft-fix
Fixes Getting Weird/Undefined Objective
2017-07-25 13:29:55 -07:00
ParadiseSS13-Bot 9cbc0bc7cc Automatic changelog generation for PR #7793 [ci skip] 2017-07-25 16:29:10 -04:00
tigercat2000andGitHub 533157ecd3 Merge pull request #7793 from Fox-McCloud/removes-cryobags
Removes Cryostasis Bags
2017-07-25 13:29:09 -07:00
Fox-McCloud 81d3acb6d6 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-25 15:21:28 -04:00
ParadiseSS13-Bot db1bfa590c Automatic changelog compile, [ci skip] 2017-07-25 15:19:11 -04:00
Fox-McCloud d5b4a031cc Fixes Getting Weird/Undefined Objective 2017-07-25 15:01:16 -04:00
ParadiseSS13-Bot 9687cca620 Automatic changelog generation for PR #7523 [ci skip] 2017-07-25 14:55:39 -04:00
Fox McCloudandGitHub 98ad0cdb76 Merge pull request #7523 from FlattestGuitar/no-stel-ples
Removes boring theft objectives
2017-07-25 14:55:37 -04:00
ParadiseSS13-Bot 7624a6bc6f Automatic changelog generation for PR #7805 [ci skip] 2017-07-25 14:53:07 -04:00
Fox McCloudandGitHub bfb9ce30bb Merge pull request #7805 from FreeStylaLT/outpost_begone
Removes Science Outpost(s), makes Cyb's z5 generic and used by Meta and Cyberiad
2017-07-25 14:53:04 -04:00
ParadiseSS13-Bot 724734310f Automatic changelog compile, [ci skip] 2017-07-25 13:44:44 -04:00
ParadiseSS13-Bot c37b47bfac Automatic changelog generation for PR #7708 [ci skip] 2017-07-25 13:42:43 -04:00
Crazy LemonandGitHub 1b8af7dc94 Merge pull request #7708 from Fox-McCloud/you-cant-outmeme-memers
Darts no longer proc reaction
2017-07-25 10:42:42 -07:00
Crazy LemonandGitHub e5a6d4a96c Merge pull request #7849 from Fox-McCloud/remove-comments
Removes All Comments about auto-correction and Finddeclaration.exe
2017-07-25 10:41:02 -07:00
FreeStylaLT 528d29074d adds generic z7 to cyberiad.dm 2017-07-25 20:03:23 +03:00
FreeStylaLT 6066068b7e also adds the generic z5 cus I forgot lol 2017-07-25 19:37:15 +03:00
FreeStylaLT bb327c3eb4 fixes the things 2017-07-25 19:34:57 +03:00
FlattestGuitar 930f0f6ddb Fox's subjective objectives 2017-07-25 18:31:18 +02:00
ParadiseSS13-Bot 982b9329ef Automatic changelog generation for PR #7782 [ci skip] 2017-07-25 12:26:37 -04:00
Fox McCloudandGitHub 14da673a8b Merge pull request #7782 from Kyep/emag_syndi_drone
Makes emagged drones more identifiable
2017-07-25 12:26:29 -04:00
ParadiseSS13-Bot 4becf86c8a Automatic changelog generation for PR #7583 [ci skip] 2017-07-25 12:24:57 -04:00
Fox McCloudandGitHub d4f305cc72 Merge pull request #7583 from Kyep/smite_hunter
Expands Smite / Dark Priest to cover many characters
2017-07-25 12:24:45 -04:00
ParadiseSS13-Bot c7a6cc7232 Automatic changelog compile, [ci skip] 2017-07-25 12:20:11 -04:00
ParadiseSS13-Bot 026c573641 Automatic changelog generation for PR #7740 [ci skip] 2017-07-25 12:03:00 -04:00
Fox McCloudandGitHub afa34c51e0 Merge pull request #7740 from owenowen212/honksquad_fix
Fix: Adds the clownish language to honksquad members
2017-07-25 12:02:58 -04:00
ParadiseSS13-Bot 765859c890 Automatic changelog generation for PR #7764 [ci skip] 2017-07-25 11:48:15 -04:00
Fox McCloudandGitHub d29d285aef Merge pull request #7764 from Kyep/shotgun_noreact
Shotgun darts are no longer noreact like cryobeakers
2017-07-25 11:48:14 -04:00
ParadiseSS13-Bot def6051e88 Automatic changelog generation for PR #7768 [ci skip] 2017-07-25 11:47:17 -04:00
Fox McCloudandGitHub a782421409 Merge pull request #7768 from Birdtalon/rockandroll
Nerfs Electric Guitar Volume
2017-07-25 11:47:16 -04:00
ParadiseSS13-Bot daf0430680 Automatic changelog generation for PR #7787 [ci skip] 2017-07-25 11:46:38 -04:00
Fox McCloudandGitHub ae1128b33d Merge pull request #7787 from imsxz/honk-rifle-self-charge
Makes HONK Rifle selfcharge
2017-07-25 11:46:36 -04:00
Fox McCloudandGitHub 74b54570d9 Merge pull request #7830 from Crazylemon64/admeme_turrets
Turrets set to shoot non-projectile objects now launch them
2017-07-25 11:45:02 -04:00
ParadiseSS13-Bot fac1f5c7c7 Automatic changelog compile, [ci skip] 2017-07-25 07:35:23 -04:00
ParadiseSS13-Bot 001614d3c7 Automatic changelog generation for PR #7860 [ci skip] 2017-07-25 06:52:24 -04:00
Fox McCloudandGitHub 42818caad9 Merge pull request #7860 from Kyep/corgi_eat_tweak
Ian is no longer Kirby
2017-07-25 06:52:23 -04:00
Crazy LemonandGitHub da7bea7c61 Merge pull request #7850 from Fox-McCloud/reagenttssss
Reagents Cleanup
2017-07-25 03:43:17 -07:00
ParadiseSS13-Bot 88790a3e3c Automatic changelog generation for PR #7853 [ci skip] 2017-07-25 06:42:57 -04:00
Crazy LemonandGitHub 7a206292d4 Merge pull request #7853 from Fox-McCloud/pointing
Can Point While Lying Down
2017-07-25 03:42:56 -07:00
Crazy LemonandGitHub 0d64bdd655 Merge pull request #7854 from Fox-McCloud/stat-improvements
Reduces Stat Calls
2017-07-25 03:40:31 -07:00
Crazy LemonandGitHub e574c84935 Merge pull request #7858 from Fox-McCloud/health-implant-fix
Fixes Health Implants
2017-07-25 03:39:32 -07:00
Fox-McCloud 5d2429e15f Merge remote-tracking branch 'upstream/master' into reagenttssss 2017-07-25 06:31:11 -04:00
ParadiseSS13-Bot b6e79b3de4 Automatic changelog compile, [ci skip] 2017-07-24 15:27:43 -04:00
ParadiseSS13-Bot 931c461306 Automatic changelog generation for PR #7333 [ci skip] 2017-07-24 14:53:37 -04:00
Crazy LemonandGitHub d9a64e23bf Merge pull request #7333 from FlattestGuitar/taste-test
Adds a taste system!
2017-07-24 11:53:35 -07:00
ParadiseSS13-Bot 7ea5c17eb0 Automatic changelog compile, [ci skip] 2017-07-24 11:22:16 -04:00
ParadiseSS13-Bot 27709ce438 Automatic changelog generation for PR #7691 [ci skip] 2017-07-24 10:23:19 -04:00
Fox McCloudandGitHub 6eaf1b59c5 Merge pull request #7691 from Kyep/fix_pirate_sentience
Fixes being able to sentience potion pirates & other sentient simple_animals
2017-07-24 10:23:16 -04:00