d5ddac3a00
Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
...
Cyber limbs fixes [FIXES #1920 ] + [Fixes #2180 ] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
a5571508d0
Merge pull request #2049 from Incoming5643/wands3
...
Magic Mania: Sprites, Fixes, Balancing, and Mini-Features
2013-12-29 11:47:59 -08:00
47ba33c50c
Removes a pair of well meaning but apparently poorly realized code fixes for edge cases.
2013-12-29 13:46:29 -05:00
d3d4c79946
Merges Heal_Damage and Heal_robotic_damage procs
...
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
87c4937558
Merge pull request #2169 from fleure/paper
...
Fixes paper with no input looking populated
2013-12-29 07:58:59 -08:00
047b7ee9ff
Merge pull request #2158 from Cluwnes/ninjutsu
...
Makes ninja gloves heat resistant.
2013-12-29 02:58:49 -08:00
46a6830dec
Merge pull request #2148 from ACCount12/master
...
Space Retrovirus fix
2013-12-29 02:57:39 -08:00
093d9b386d
Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
2013-12-29 02:20:09 -05:00
e06e9ffa4c
Merge pull request #2047 from Miauw62/condimentpacks
...
Condiment packs: The Condipacking
2013-12-28 21:16:43 -08:00
889b9c66f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into Toxic_converter_Fix
2013-12-29 00:40:24 +00:00
b07bca861f
Fixes paper with no input looking populated
2013-12-28 16:30:50 +00:00
22060e18d4
Merge pull request #2133 from Giacom/labor_tweaks
...
Labor Camp Tweaks #2
2013-12-27 22:15:51 -08:00
dec6e4cd89
Makes ninja gloves heat resistant.
...
Ninjas will no longer burn their hands on mere lights.
2013-12-27 15:45:27 -08:00
392c6d51a9
Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
2013-12-27 02:33:47 -05:00
7c2fbba76f
Merge pull request #2111 from Perakp/voiceChangerFix
...
Voicechanger fix
2013-12-26 22:06:38 -08:00
26a1bb65f2
Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
...
Conflicts:
code/modules/mob/death.dm
code/modules/mob/living/carbon/alien/death.dm
code/modules/mob/living/carbon/brain/death.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/carbon/monkey/death.dm
code/modules/mob/living/silicon/death.dm
code/modules/mob/living/silicon/robot/death.dm
2013-12-27 00:55:44 -05:00
15ef414627
Viral fix
...
Fixed strain_data, removed some unused code.
2013-12-27 17:43:26 +12:00
f36a7d764c
Merge pull request #2110 from Perakp/mimeSpells
...
Changes mime abilities into spells
2013-12-26 20:56:40 -08:00
4f144e0111
Merge pull request #2130 from Giacom/gib_refactor
...
Refactored gib() and dust()
2013-12-26 20:34:50 -08:00
1f3eb1de27
Merge pull request #2124 from Miauw62/shootforthestars
...
Fingerprints, span classes and text path fixes.
2013-12-26 19:42:05 -08:00
5d715da882
Merge pull request #2113 from Giacom/can_inject
...
[MAP] Syringe gun projectiles will now display a message when the shots are deflected by the THICKMATERIAL flag.
2013-12-24 00:27:21 -08:00
02a1e9bd0f
* Increased the amount of iron that spawns in the labor camp.
...
* Decreased the amount of points you get from diamond and bananium. Increased the amount of points you get from Iron and alloys.
* You can now see which minerals give you which points from the claiming console.
2013-12-23 22:26:36 +00:00
375b9f08ea
Fixes the flags of the beret.
2013-12-23 21:58:20 +00:00
173e1cb391
* Refactored gib() and dust()
...
* Refactored ex_act(), for mobs, a little.
* Removed the code which gibbed dead bodies with any severity.
2013-12-23 17:56:58 +00:00
28be6cfe98
* Fixes #2115 and the captain's space suit path was changed to /obj/item/clothing/suit/space/captain from /obj/item/clothing/suit/armor/captain
...
* Updated the map with the new path.
2013-12-23 13:41:50 +00:00
38e0ae8848
Merge pull request #2019 from Jordie0608/Dogmas
...
Added reindeer hats
2013-12-23 04:18:42 -08:00
0338a66c2a
Adds fingerprints to a bunch of stuff. De-texts computer build paths.
2013-12-22 18:57:33 +01:00
9e40407906
Merge branch 'master' of https://github.com/tgstation/-tg-station into condimentpacks
...
Conflicts:
code/modules/reagents/reagent_containers/food/condiment.dm
2013-12-22 15:19:23 +01:00
c39f61fe27
* Syringe gun projectiles will now display a message when the shots are deflected by the THICKMATERIAL flag.
...
* Fixes the space helmet not having the flag.
* Fixes various coverall armour not having the THICKMATERIAL flag.
2013-12-22 01:43:03 +00:00
58d0ed5221
Merge pull request #2094 from RobRichards1997/19/12/2013-Sec-see-Sec-Sprites
...
Security Sprite updates.
2013-12-21 15:24:14 -08:00
40929b37d3
Merge pull request #2093 from Giacom/small_fixes_and_tweaks
...
Small Tweaks and Fixes
2013-12-21 15:12:01 -08:00
f00c80bd43
Merge pull request #2104 from Giacom/gulag_therevenge
...
[MAP] The Gulag: The Revenge: Part 2.5
2013-12-21 15:05:57 -08:00
e7579e2aa8
Merge pull request #1986 from Perakp/janitorCartFix
...
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
b12f996512
Merge pull request #2106 from Bobylein/labcoats
...
Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Paper...
2013-12-21 13:58:13 -08:00
5fb0d05dd1
Merge pull request #2096 from Aranclanos/SweetLindaNobodyWillTouchYou
...
Small fixes for Linda.
2013-12-21 13:57:15 -08:00
24676cb23c
Merge pull request #2091 from Razharas/ChemDesp
...
Fixes chem dispenser properly
2013-12-21 13:56:04 -08:00
9d24a900ae
Merge pull request #2066 from Perakp/slipFix4
...
No slipping when lying down
2013-12-21 13:54:39 -08:00
bcfcb3a9cf
Merge pull request #2073 from Jordie0608/ShakeTheRoom
...
Gibbing borgs explode violently
2013-12-21 13:42:59 -08:00
16cb706b79
Merge pull request #2062 from Aranclanos/RnDConsole
...
RnD console runtimes fix.
2013-12-21 13:38:32 -08:00
b1996a77e1
Fixes AI seeing the name of the person who speaks over radio using a voice changer.
2013-12-21 23:01:52 +02:00
0d1ba1eccf
Changes mime abilities into spells. Admins can now give these from the 'give spell' menu. Unlike previous mime abilities, these are not transferred when a mime is cloned.
2013-12-21 20:54:07 +02:00
65e0931d55
Merge branch 'master' into janitorCartFix
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
2b827e3592
Bugfix: Slimes that reproduce will now properly inherit magic spells
2013-12-21 02:08:21 -05:00
fe0e995959
Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Papers in their suit slot.
2013-12-21 07:47:47 +01:00
47545f439e
* Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.
...
* Added sprites for the stacking machine going in the reverse direction, just set the dir to 1 instead of 2.
* Added prison intercoms which will not broadcast until someone hacks it. Added these intercoms in the gulag, the perma brig and the brig cells.
* When a prisoner has received enough points for freedom, if they try to move the shuttle, or open the middle door, while someone is on it they will get an error message. This way there is no way for a free'd prisoner to release their fellow prisoners once they have reached their point target. The shuttle will depart right away when you call the shuttle from the stacking console, to stop prisoners from getting on while it departs.
2013-12-20 22:09:06 +00:00
046714d864
Merge pull request #2092 from Giacom/grab_monkey
...
Monkeys no longer wander off when being pulled or grabbed.
2013-12-20 11:44:25 -08:00
a03c5ba388
Merge pull request #2081 from Razharas/brakes
...
Fixes trunks being unwelded while under machinery
2013-12-19 22:31:32 -08:00
e44e31f8c9
Merge pull request #2077 from Razharas/fix
...
Fixes soil being wrenchable
2013-12-19 22:05:47 -08:00
a73721f7a1
Fixes for Gia:
...
Fixes the mysteries of reviving simple animals in the least intrusive manner I could think of
Removes player_controlled because ckeys did much the same thing
Uses update_canmove() instead of hardseting it
One last Bugfix: Simple animals generated with no real_name will use their initial name as their real name so that transformed antags will not get a "(survived as )" because the thing they turned into didn't have a real_name set.
2013-12-19 21:49:15 -05:00
213f3fff31
Some fixes for Linda, now the Move() proc of objects that block air is different. Example below.
...
object/Move()
var/turf/T = loc
..()
move_update_air(T)
2013-12-19 22:13:21 -03:00
Aranclanos
Incoming
Robson Richards
Rockdtben
Giacom
fleure
Cheridan
Cluwnes Honk
ACCount
Miauw
Perakp
Bobylein