7c64602766
fixes the captain being a worm(spelling error).
2015-11-07 14:18:08 -08:00
8814bdd8bf
Merge pull request #12827 from AndrewJacksonThe2nd/radio_icons_goofball
...
Makes sleepypens refillable
2015-11-07 14:40:40 -06:00
09a506ef0f
Merge pull request #12877 from KorPhaeron/insert_tf2_joke
...
Allows golems to wear hats
2015-11-07 14:33:00 -06:00
284ad97289
Merge branch 'master' of https://github.com/tgstation/-tg-station into action_action_action_action_action
...
Conflicts:
icons/mob/actions.dmi
2015-11-07 14:30:31 -05:00
a88b5d797c
*adds action buttons for slimes
...
*technically obsoletes the slime tab, but I left it in just in case anyone prefers it.
2015-11-07 14:24:48 -05:00
8fce742d0a
Merge remote-tracking branch 'upstream/master' into fuk
...
Conflicts:
data/mode.txt
icons/mob/mob.dmi
icons/mob/suit.dmi
icons/obj/clothing/gloves.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
2015-11-07 15:56:39 -03:00
d966c37c6a
Hand of God Fixes/Tweaks
...
Fixes healing fountain construction sprite.
Nexus are now destroyed properly.
Borged cultists will now lose antag status properly.
Round end message fixed.
Feedback messages improved to be clearer, and lots of typos fixed.
Smite no longer uses up faith if there is no valid target in the turf.
Adds an atom/attack_god() proc.
Fixes the greeting messages for prophets and followers, improves god msg.
Fixes nexus being spawned on dense turf after 2min, and general sanity.
Fixes attacking structures with abstract items.
Adds click delay and attack animation for attacking structures.
Fixes a lot more typos.
Fixes defense pylon friendly fire.
Makes defense pylon togglable on its god's click.
Cleans up gun_turret code a little in general.
Adds deconversion by loyalty implant or holy water (basically rev+cult).
Gods will now die when they have no followers left.
Adds the HoG gods to the traitor panel.
2015-11-07 15:25:28 -03:00
3c03fa9b24
Makes cloaks into exosuit items. Modifies their armor values so they decent replacement for existing head of staff exosuit items. Compiles this time, I promise.
2015-11-07 01:31:57 -08:00
59e82d8e4b
Nar-Sie
2015-11-07 02:45:58 -06:00
af411525dc
Merge pull request #12841 from KorPhaeron/ui
...
Swaps Guardian HUD button locations
2015-11-07 08:06:42 +03:00
3553509936
Merge pull request #12855 from AnturK/abdfix
...
Fixes advanced camera resets.
2015-11-07 08:06:11 +03:00
c8a385e833
Merge pull request #12859 from Jalleo/RPGlootfix
...
Fixes rpgloot.dm by removing + and -
2015-11-07 08:05:52 +03:00
4c8f9303ce
Merge pull request #12848 from KorPhaeron/ghost_spawner
...
Ghost role spawners for mappers
2015-11-07 07:27:06 +03:00
25f36bd158
Merge pull request #12869 from Menshin/clean_ghost_hud
...
Made new_player mobs use the base Login() proc
2015-11-07 06:35:52 +03:00
9ee8faea73
Merge pull request #12552 from KorPhaeron/disposals
...
Click dragging mobs into disposals
2015-11-07 06:16:41 +03:00
4be1bfbbd2
Merge pull request #12603 from JJRcop/chronosuit_phase_better
...
New chronosuit teleport mechanics
2015-11-07 06:12:44 +03:00
5b1a2836fa
Merge pull request #12772 from Xhuis/shadowling_update_5
...
Shadowling Update V
2015-11-07 06:11:39 +03:00
01f50fe4ff
Merge pull request #12861 from phil235/FixGibMorph
...
Fixes gibbed morph not dropping items.
2015-11-07 06:09:20 +03:00
13b7de40e9
Merge pull request #12842 from Jalleo/Lifecleanup
...
Cleans up copy pasted…
2015-11-07 06:08:46 +03:00
5e9ef18dad
Merge pull request #12868 from phil235/BloodcrawlSlimeBugFix
...
Fixes slimes not being detached from their victim when the victim starts bloodcrawling.
2015-11-07 06:07:57 +03:00
5e736281a7
Merge pull request #12871 from YotaXP/origin_tech_fix
...
Fixed bad `origin_tech` values.
2015-11-07 06:06:48 +03:00
3308f76efb
Improves speed of redraw_lighting()
...
No longer uses animate() when unneeded, because animate() is slow.
Also turns Clamp() into a macro to reduce proccall overhead.
The whitespace changes in atmos are needed because of the way the
preprocessor handles macros.
Thank you MrPerson for helping with this.
2015-11-06 23:36:03 -03:00
0066670421
Merge pull request #12872 from Anonus/gtfoghost
...
Revenant Changes XVIII: You'd better be afraid of the ghost
2015-11-07 04:27:52 +03:00
8e2abcb378
Merge pull request #12700 from lordpidey/lordpidey_inject
...
Adds new reagent application method, INJECT. This will hopefully pre…
2015-11-07 04:06:34 +03:00
ea4bdc9ad7
Fixes the smartfridge.dm properly
2015-11-06 20:24:40 +00:00
17e034bf47
Changes chronosuit hands_nodrop_states to a bitfield from a list
2015-11-06 12:47:25 -05:00
4892c79a0d
Merge pull request #12862 from Robustin/master
...
Slows down nutrition loss in Slime People
2015-11-06 19:44:31 +03:00
9e69eafef1
Merge pull request #12836 from KorPhaeron/chill
...
New dark blue slime reaction (fireproofing potion)
2015-11-06 19:42:17 +03:00
4e85f49d8a
Hats
2015-11-06 01:54:14 -06:00
398f94ca6a
Merge remote-tracking branch 'upstream/master' into chronosuit_phase_better
2015-11-06 00:01:26 -05:00
1c86a632f1
Chronosuit performance/saneness adjustments
2015-11-05 23:57:14 -05:00
3f3994f549
Overload lights no longer shocks through walls.
2015-11-05 20:36:04 -05:00
0f23809346
Revenant changes XVIII
...
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
2015-11-05 18:50:51 -05:00
d1337fa009
New_player mob now uses generic Login() proc
2015-11-05 23:50:42 +01:00
2ffc5f055c
Fixed bad origin_tech values.
2015-11-05 15:32:25 -05:00
4b9e7e4f35
Merge pull request #12847 from Shadowlight213/dsaylogging
...
Reworks asay and dsay logging so they can be easily identified
2015-11-05 21:16:32 +03:00
aa848d0e4c
Update species_types.dm
2015-11-05 11:08:06 -05:00
31ad6964de
Fixes slimes not being detached from their victim when the victim starts bloodcrawling.
2015-11-05 16:56:11 +01:00
9003368078
Lets used brains be reset.
...
Positronic brains now may be reset if abandoned by the user.
2015-11-05 08:46:26 -06:00
6555156399
Merge pull request #12812 from KorPhaeron/lasertag
...
Makes lasertag projectiles beams
2015-11-05 08:15:58 -06:00
eaf87bb7f9
Burn state
2015-11-05 08:06:39 -06:00
fdf869fa0f
Update species_types.dm
2015-11-04 17:24:28 -05:00
ed68f0bd1e
Merge pull request #12813 from KorPhaeron/xenobio_fixes
...
Xenobio console fixes
2015-11-04 23:42:09 +03:00
8ab8fa3767
Merge pull request #12819 from Incoming5643/slime_time_live
...
Little QoL thing for slimeperson splitting
2015-11-04 23:40:26 +03:00
9fae7a2174
Update species_types.dm
2015-11-04 15:40:08 -05:00
f31bb62839
Slime Persons no longer a death sentence, splitting viable
...
Two problems:
1) Being a slime person devoured your nutrition status and within a short period of time would have you on death's door. It took nearly 10 minutes of cryotherapy and food being shoved into my mouth to save my life as a slime person who never even got a nutrition starvation warning.
2) You will never have enough slime for splitting unless you have an odysseus copy your slime jelly and then shoot you full of needles with it.
This PR attempts to fix both issues by making the nutrient loss slower and the slime gain faster and capable of reaching 200 when you can split.
2015-11-04 14:59:13 -05:00
15781c8796
Fixes gibbed morph not dropping items. Butchering now drops all items instead of just 10 at a time.
2015-11-04 20:54:56 +01:00
e9e0f452dd
Fixes the smartfridge.dm
2015-11-04 17:45:29 +00:00
55e138c77d
Merge pull request #12817 from Incoming5643/so_long_dental_plan
...
Dental implant fixes
2015-11-04 11:28:30 -06:00
e563c0b47e
Quick merge before complete do not send this to main repo yet
2015-11-04 16:41:17 +00:00
TechnoAlchemist
Cheridan
Incoming
Tkdrg
KorPhaeron
Razharas
blah
JJRcop
Nerd Lord
Menshin
YotaXP
Robustin
phil235
GunHog