Commit Graph

15963 Commits

Author SHA1 Message Date
Cheridan 87edea4eab Merge pull request #8969 from phil235/BundleFix2
Another bundle of fixes
2015-04-15 21:08:13 -05:00
Cheridan a9002da949 Merge pull request #8776 from Xhuis/its_time_for_slimeperson_on_slimeperson_action
Adds an additional effect to green slime cores
2015-04-15 08:53:55 -05:00
Cheridan 4468cf7bc5 Merge pull request #8935 from Incoming5643/deep_fried_lizards
Extra mutantrace parts won't hold color if the body gets husked
2015-04-15 08:29:26 -05:00
Swag McYolosteinen 7c36795db3 Merge pull request #8970 from phil235/WingFixChu
Fixes wingfangchu recipe.
2015-04-15 13:03:58 +02:00
Swag McYolosteinen 5e6cbd57cd Merge pull request #8916 from Iamgoofball/patch-55
Fixes and changes Napalm Recipe
2015-04-15 13:03:14 +02:00
Swag McYolosteinen 36cac2405d Merge pull request #8932 from Iamgoofball/patch-56
Fixes incendiary grenades
2015-04-15 13:03:03 +02:00
Swag McYolosteinen f4aa06af22 Merge pull request #8972 from MrStonedOne/patch-5
Fixes runtime when clientless mobs change areas
2015-04-15 13:02:53 +02:00
Swag McYolosteinen 65f0e36eeb Merge pull request #8942 from AnturK/martialfixes
Martial art fixes
2015-04-15 13:02:23 +02:00
Swag McYolosteinen 6c1117c14d Merge pull request #8958 from Incoming5643/excuse_me_while_I_vent_a_bit
buffs head slugs a bit
2015-04-15 13:01:58 +02:00
Swag McYolosteinen a90a6a0699 Merge pull request #8971 from MrStonedOne/patch-4
fixes sawu's shit spamming my runtimes.
2015-04-15 12:55:25 +02:00
Swag McYolosteinen baf3c06171 Merge pull request #8957 from MrStonedOne/I-spent-five-minutes-trying-to-think-up-a-branch-name-and-all-I-got-was-this-lousy-excuse-of-one
Admins can now drag ghosts to mobs to put that ghost in control of that mob
2015-04-15 12:24:13 +02:00
MrStonedOne 2227b7adb3 Adds some sanity checks to admin ghost drag. 2015-04-15 02:58:54 -07:00
Cheridan 26a974a8c3 Merge pull request #8943 from MrPerson/ied_fixes
IED fixes
2015-04-14 19:40:50 -05:00
phil235 d5318a033b Merge pull request #8933 from Cheridan/snackbar
New barsign!
2015-04-15 00:33:18 +02:00
Cheridan 63b590d1c8 Merge pull request #8950 from Incoming5643/malfunction_junction_whats_your_major_malfunction
Fixes malf powers being broken
2015-04-14 17:22:31 -05:00
Cheridan bf6ae43aec Merge pull request #8917 from phil235/BorgDrillFix
Fixes miner cyborg being able to eject their drill's cell.
2015-04-14 17:19:27 -05:00
phil235 de8080f7b2 Merge pull request #8927 from Xhuis/shadowlingUpdateOne
Shadowling Update I
2015-04-14 21:22:46 +02:00
Xhuis 5075909757 More bug fixes 2015-04-14 14:23:30 -04:00
MrStonedOne 71c07dd0e5 Fixes runtime when clientless mobs change areas 2015-04-14 10:41:12 -07:00
MrStonedOne a6602795c9 fixes runtimes with npcpool 2015-04-14 10:30:58 -07:00
phil235 c39168b059 Fixes wingfangchu recipe. It is now a soup (consistent with its sprite) 2015-04-14 18:44:55 +02:00
phil235 2ed906b990 Fixes inhand sprites for eggs.
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
MrStonedOne e1338fed2b fixes a minor mishap with ghostize in admin ghost drops 2015-04-14 07:21:23 -07:00
MrStonedOne f2e2940255 Makes admin ghost drag use ghostize 2015-04-14 06:01:42 -07:00
AnturK cad52e1672 - Fixes temporary martial styles becoming permanent 2015-04-14 13:26:12 +02:00
AnturK 9048a5fca1 - Fixes suplex logging 2015-04-14 08:47:02 +02:00
Incoming 68849b9c8e Adds ling control to the head slug
Adds a changelog!
2015-04-13 21:44:54 -04:00
Xhuis 21e8564210 One more define 2015-04-13 21:15:14 -04:00
Incoming 507084a0c2 conflicting with myself 2015-04-13 21:01:25 -04:00
Incoming d10454e810 buffs head slugs a bit:
Head slugs can now vent crawl (they're so tiny why didn't they already have this?)
Head slugs can stumble around for 10 seconds after they lay their egg so they don't die super obviously right next to their infected corpse
2015-04-13 20:56:54 -04:00
MrStonedOne 39decb8bf6 Admins can now drag ghosts to mobs to put that ghost in control of that mob.
This functions the same way as editing the ckey in vv, and has the same permission checks
It requires the admin also be a ghost to avoid conflicts with other drag drop code.
2015-04-13 17:33:04 -07:00
Xhuis f6c8b3bfc5 Replaces fonts with spans, adds defines 2015-04-13 19:42:50 -04:00
AnturK 9ee88e7c4a - Fixes scroll usage
- Fixes wrestling belt name
2015-04-14 01:14:18 +02:00
Xhuis f6011468db Removes unnecessary colon 2015-04-13 19:14:05 -04:00
Xhuis 87541dabc2 Progress 2015-04-13 19:12:29 -04:00
Incoming 68eb02adbd Fixes malf powers being broken because canusetopic was never a thing for AIs before this point 2015-04-13 17:40:28 -04:00
Cheridan 8402c714be Merge pull request #8921 from xxalpha/lovely_vibes
Added /obj/item/stack path to Game Panel.
2015-04-13 16:33:19 -05:00
Xhuis 7b5760f6d3 Merge remote-tracking branch 'remotes/upstream/master' into shadowling_1 2015-04-13 16:47:00 -04:00
Xhuis 9c752683ef Shadowling update one 2015-04-13 16:46:49 -04:00
Iamgoofball a98eee4fa8 here we gop 2015-04-13 12:01:38 -07:00
Iamgoofball 63504f7a67 whoops 2015-04-13 12:01:09 -07:00
Swag McYolosteinen 11603451df Merge pull request #8577 from Iamgoofball/spin
CRITICAL LAG FIX FOR SINGULARITIES AND THROWING
2015-04-13 20:39:08 +02:00
Iamgoofball 633c20848f Update singularity.dm 2015-04-13 11:36:39 -07:00
Iamgoofball 1ffb753acf reverts infinite spin 2015-04-13 11:27:34 -07:00
Iamgoofball b17e2d07fd Update atoms.dm 2015-04-13 11:26:49 -07:00
Iamgoofball 3c4b25902c Update atoms_movable.dm 2015-04-13 11:25:37 -07:00
Iamgoofball cd0d79d757 fix part 1 2015-04-13 11:25:19 -07:00
Remie Richards 3a7a300081 Merge pull request #8155 from AnturK/abduction
Abduction Gamemode [Ready]
2015-04-13 18:06:55 +01:00
AnturK 6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Cheridan 8123093880 Merge pull request #8918 from MrPerson/ie_modern
Make DS's IE browser use the most modern available instead of IE7
2015-04-13 09:35:03 -05:00