e6efbdf88f
Cogscarab storage is no longer painted cardboard ( #18821 )
2016-06-22 18:48:36 -05:00
ab0e354775
Clockwork treads are no longer NOSLIP ( #18828 )
2016-06-22 18:47:01 -05:00
b97f9f154b
Ratvar's Flame is no longer a good melee weapon ( #18829 )
2016-06-22 18:46:45 -05:00
1e78916458
Invoking Sevtug is somewhat less obscenely powerful ( #18831 )
2016-06-22 18:46:05 -05:00
8b29e3e049
Merge pull request #18677 from coiax/cellular-emporium
...
Changling evolution menu becomes cellular emporium
2016-06-23 10:06:51 +12:00
81da43bdc5
Merge pull request #18790 from tgstation/RemieRichards-disappointed
...
Venus human trap changes
2016-06-23 10:05:39 +12:00
b622d10ecb
Fixes three problems of my own identification/invention ( #18824 )
...
* Fixes three problems of my own identification/invention
1. Fixes meaty ores spawning with invisible "snack" meats
2. Fixes easyattachment limbs remaining in your hand sometimes
3. Mirrors the fix of all ghost role sleepers being exclusively male from my other, less mergable pr.
* I failed a spot check
2016-06-22 17:03:09 -05:00
0432cd9bb4
Merge pull request #18484 from coiax/random-space
...
All of space is now randomised
2016-06-23 09:12:48 +12:00
8c87be8735
Spatial Gateways will last twice as long ( #18808 )
...
* Spatial Gateways will last slightly longer
* no slabs
2016-06-22 16:12:10 -05:00
619543d9c2
Smacks clockwork component generation in the face again ( #18804 )
2016-06-22 16:02:46 -05:00
a6fc773540
Merge pull request #18723 from coiax/pond-skipping
...
Adds visible ripples indicating shuttle's transit
2016-06-22 11:24:44 -05:00
cfd478eb79
Pope Fix Pt.1
2016-06-23 01:05:18 +10:00
321e1d52f7
Merge pull request #18801 from sawu-tg/master
...
Pope of Sin Update
2016-06-22 09:06:12 -04:00
9463880ed8
Renames the initTemplateZLevel function to initTemplateBounds
2016-06-22 22:56:07 +10:00
1bfca19bf9
Update/fix
...
* Chapel is now loaded upon a pope spawning, as it's own Z-level
* ZLevel init for template loading separated into it's own function.
* Including missing sprites for the Hades Acolyte.
2016-06-22 22:37:38 +10:00
d950565a3f
Make Staff of Honkmother slightly less OP ( #18802 )
...
Just reducing the stun on it a smidgen so it doesn't stun like a rapid fire stun gun.
2016-06-22 03:23:05 -05:00
796b502ff0
Merge branch 'master' of https://github.com/tgstation/tgstation
...
Conflicts:
_maps/map_files/generic/z2.dmm
icons/mob/animal.dmi
2016-06-22 15:05:00 +10:00
7ab8f8772f
Merge pull request #18794 from KorPhaeron/durkel
...
Adds missing return to boss loot
2016-06-21 23:13:49 -05:00
dbf467136f
Merge pull request #18830 from MMMiracles/a_skele-ton
...
Fixes Invisible Skeletons
2016-06-21 23:10:56 -05:00
4bc99d1b2e
Merge pull request #18798 from Niknakflak/AngelAI
...
Adds the Angel AI Core sprite to the game
2016-06-22 15:50:37 +12:00
d3e183a4d4
do the skeleton
2016-06-21 22:55:11 -04:00
5f57279f53
Taunting Tirade no longer stuns ( #18795 )
2016-06-21 20:42:46 -05:00
0c45602585
Merge pull request #18731 from Xhuis/chaplain_vs_ratvar_buff
...
Makes holy weapons protect against Ratvar's magic
2016-06-22 12:41:03 +12:00
b85862f070
Merge pull request #18785 from Incoming5643/patch-12
...
Fixes Infinitely Generating Exotic Blood
2016-06-22 12:32:23 +12:00
ca7067eded
Merge pull request #18741 from KorPhaeron/tacticalespionageaction
...
Tactical Espionage Action
2016-06-22 12:08:05 +12:00
d410d57d05
Disables umbras ( #18819 )
2016-06-21 17:54:21 -05:00
ccadd14147
Merge pull request #18765 from ChangelingRain/nukemaster
...
Nuclear bombs now only explode the station as long as they're in a non-space area on the station zlevel
2016-06-22 09:51:34 +12:00
6b1ba6adec
Merge pull request #18767 from ChangelingRain/legiondoor
...
Fixes legion door alert
2016-06-22 09:51:06 +12:00
120810316e
Merge branch 'master' into cellular-emporium
2016-06-21 22:32:01 +01:00
e5b323b99b
Bandaid fix for null rod checking
2016-06-21 17:29:12 -04:00
3250d74eb5
Revert "Removes umbras"
2016-06-22 09:06:05 +12:00
12b8b1a9b2
Merge pull request #18735 from coiax/emergency-drone
...
Adds Drone Shells to Emergency cargo packs
2016-06-22 09:04:13 +12:00
1732b8091f
Merge pull request #18755 from Xhuis/people_on_this_server_make_me_so_damn_frustrated_sometimes
...
Removes umbras
2016-06-22 08:58:14 +12:00
8f11d98e98
Prevents ocular wardens from targeting null rod holders
2016-06-21 14:24:29 -04:00
ff7d7fd89d
Holy items won't protect against the gods
2016-06-21 14:23:38 -04:00
44875e7fd4
Fixes holoparasites spamming messages while taking negative damage ( #18774 )
2016-06-21 10:57:07 -05:00
8003b631ac
Merge pull request #18761 from ChangelingRain/alloygain
...
Scarab proselytizers reap more alloy from metal and plasteel and can now reap alloy from rods directly
2016-06-21 10:09:43 -05:00
e1f4feef2c
Merge pull request #18760 from ChangelingRain/ratvarsbodyshop
...
You can now repair clockwork structures with a clockwork proselytizer
2016-06-21 10:08:43 -05:00
8c8c69c8ac
Merge pull request #18714 from coiax/fridge-magnet
...
Station rename logging, admin reject button
2016-06-21 08:46:17 -04:00
3e30473365
Applied MSO's proposed changes
2016-06-21 13:34:36 +01:00
1b56de3d8e
Pope of Sin Update
...
* Acolytes of Hades have received their own unique sprite.
* Fixed an error that would cause Hades to be permanently stuck in Wrath Phase
* Acolytes summoned by Hades are now unable to move more than 6 tiles from him, to prevent leading.
* Hades' Ultimate Wrath has been given an extra effect to indicate it's happening.
* Sins are now global procs.
* Upon death, Hades' corpse will now transform into a portal to the Chapel of Sin, a small away-mission with a puzzle. Completing the puzzle will reward players with an Imbued version of Hades' Staff, giving them access to his power of Judgement.
2016-06-21 20:05:23 +10:00
269ccc3cf0
Merge pull request #18743 from ChangelingRain/fcrnxvagurgbathrbsgurtbqf
...
Non-servant humans can't understand clockwork mobs
2016-06-21 20:35:24 +12:00
3a7eab6e05
Merge pull request #18729 from coiax/remove-spawn-3
...
Remove spawn III
2016-06-21 20:11:08 +12:00
01d4d02b70
conflicts + undo loc changes
...
attackself/dragging the board now deletes it and spawns a new board of the proper type again instead of setting locs
2016-06-20 22:22:50 -07:00
1f1d87c2e3
Angel AI
2016-06-20 22:19:11 -07:00
0287abf2dc
Borgs now get less confused over time!
2016-06-20 23:55:13 -05:00
d35a31d4ac
Blood Contract
2016-06-20 20:14:35 -05:00
13429cf1d4
user -> src
2016-06-21 01:27:13 +01:00
c2218f9dd7
break -> continue
2016-06-21 01:22:13 +01:00
3eed211d91
Venus human trap changes
...
* Venus human traps now obey the laws of physics when it comes to finding targets
* Venus human traps will continue to grab hold of you even if you're through a wall SO LONG AS YOU WERE ORIGINALLY A VALID TARGET (headcannon: it can still feel you and grasp hold of you with it's vine)
2016-06-21 01:18:53 +01:00
Joan Lung
oranges
Incoming5643
Cheridan
Sawu
Faltnor
MMMiracles
Xhuis
Jack Edge
PKPenguin321
NikNakFlak
Cheridan
KorPhaeron
Remie Richards