Jordie0608
26ca19e07d
Merge branch 'master' of https://github.com/tgstation/-tg-station into tfwyoubreakyourownfix
...
Conflicts:
code/modules/mining/mine_items.dm
2015-04-17 18:02:45 +10:00
phil235
6807b1ae48
Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienNestPixelFix
...
Conflicts:
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
2015-04-16 23:44:12 +02:00
AnturK
bc71b4b8b3
* Fixes observers not seeing abductor hivemind
...
* Fixes humans without glands getting added to experiment history
* Makes science tool marking more intuitive (Just one click to mark anything now)
* Adds small storage space
* Adds Advanced Baton - Stun,Sleep,Cuff in one tool
* Makes console landmarks search for nearby machine/pad instead of spawning them next to it for mappers
* Fixes only one team spawning
* Fixes roundend report
* Fixes adding more teams to the round
2015-04-16 12:15:41 +02:00
Jordie
c4b0821090
Merge pull request #8983 from MrStonedOne/patch-7
...
Removes resting from ghost verb
2015-04-16 18:19:28 +10:00
Jordie
c46bac3721
Merge pull request #8982 from MrPerson/fun_fact_you_can_currently_attack_light_with_a_toolbox
...
Makes light objects not appear via alt-click
2015-04-16 18:19:18 +10:00
Jordie
15a9d37d4e
Merge pull request #8975 from MrStonedOne/patch-6
...
Fixes href exploit relating to admins without +fun being able to force events
2015-04-16 18:19:07 +10:00
Jordie
4c1a1c8c87
Merge pull request #8967 from phil235/BundleFix1
...
A big bundle of fixes
2015-04-16 18:18:53 +10: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
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
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
MrStonedOne
f1943945e2
Removes resting from ghost verb
...
This caused issues with mobs like borgs and simple mobs where they would be unable to move if admins put another ckey in the mob after they ghosted but there would be no clear indication as to why they couldn't move and in some cases, no way to un-rest without further admin intervention.
2015-04-14 23:50:06 -07:00
MrPerson
58a1f12103
Makes light objects not appear via alt-click
...
Fixes #8954
2015-04-14 20:59:52 -07:00
Cheridan
26a974a8c3
Merge pull request #8943 from MrPerson/ied_fixes
...
IED fixes
2015-04-14 19:40:50 -05: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
phil235
a584b8df0e
woops
2015-04-14 20:30:02 +02:00
MrStonedOne
d9a9ae1358
adds a permission check to force event's topic
...
There existed a href exploit that allowed any admin to force an event.
2015-04-14 10:48:24 -07:00
phil235
882ab28794
derp, wrong PR.
2015-04-14 19:09:57 +02:00
phil235
c39168b059
Fixes wingfangchu recipe. It is now a soup (consistent with its sprite)
2015-04-14 18:44:55 +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
phil235
0f6a60600d
Fixes alien nest overlay appearing above standing mobs. Also fixes lying mobs appearing in front of standing mobs.
...
Fixes alien humanoid custom pixel shift being reset by life(). Refactors how pixel reinitialisation (when standing or lying or during animations) is done. Adding get_standard_pixel_y_offset() proc (and same for x), removing lying_pixel_y_offset var from all mobs, adding custom_pixel_x_offset (and y) so Wjohnston can play with his aliens.
2015-04-14 14:55:05 +02:00
phil235
081bae6740
Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
...
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02: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
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
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
AnturK
6fa8e5f02d
Adds Abduction Mode
2015-04-13 18:40:15 +02:00
phil235
ba772b3291
derp.
2015-04-13 16:34:49 +02:00
MrPerson
0a6fb70137
IED fixes
...
Fixes #8919 - can pixel_x/pixel_y is inherited by the IED after construction
Fixes an unreported issue where the can underlay of IED's would be rendered underneath your HUD when it was in your hands.
2015-04-13 07:00:19 -07:00
Jordie
a81f221589
Merge pull request #8915 from Iamgoofball/patch-54
...
Fixes #8893
2015-04-13 18:24:54 +10:00
Jordie
cba7fe8a28
Merge pull request #8900 from Ikarrus/ganguplink
...
Set list of uplink-purchasable items for Gang Mode
2015-04-13 18:24:35 +10:00
Jordie
c1f7c2d4dc
Merge pull request #8898 from sawu-tg/npcfixes
...
Fixes usage of range() to check distance.
2015-04-13 18:24:23 +10:00
Jordie
c3801757de
Merge pull request #8892 from phil235/PiniataPeteFix
...
Fixes the meat type of many simple animals
2015-04-13 18:24:13 +10:00
Jordie
86f5b381a3
Merge pull request #8884 from Incoming5643/Ooo_whatcha_say
...
adds speak emote to a lot of simple animals that lacked them
2015-04-13 18:23:51 +10:00
Jordie
e9d264ba55
Merge pull request #8881 from phil235/SentiencePotionFix
...
Fixes invisible snacks and mobs from gold and silver slime reaction.
2015-04-13 18:23:40 +10:00
Jordie
322bad016f
Merge pull request #8795 from Incoming5643/technically_just_another_pacid_blob_nerf
...
Adds three new blob chems
2015-04-13 18:23:05 +10:00
Jordie
d8ef9ecb44
Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem
...
Adds space carp traitor item and carp plushie "attack"
2015-04-13 18:22:53 +10:00
Jordie
e6143f6493
Merge pull request #8810 from AnturK/everybodywaskungfufighting
...
Adds martial art datum and three styles
2015-04-13 18:22:37 +10:00
Jordie
becdb6fcc3
Merge pull request #8746 from ACCount12/diseasesfixes
...
Fixes for DNA spread and transformation diseases
2015-04-13 18:22:21 +10:00
Jordie
ae120db87c
Merge pull request #8728 from AnturK/action_button
...
Generic Action\Action Button System
2015-04-13 18:22:08 +10:00
