Commit Graph

11654 Commits

Author SHA1 Message Date
Razharas 4be1bfbbd2 Merge pull request #12603 from JJRcop/chronosuit_phase_better
New chronosuit teleport mechanics
2015-11-07 06:12:44 +03:00
Razharas 5b1a2836fa Merge pull request #12772 from Xhuis/shadowling_update_5
Shadowling Update V
2015-11-07 06:11:39 +03:00
Razharas 01f50fe4ff Merge pull request #12861 from phil235/FixGibMorph
Fixes gibbed morph not dropping items.
2015-11-07 06:09:20 +03:00
Razharas 13b7de40e9 Merge pull request #12842 from Jalleo/Lifecleanup
Cleans up copy pasted…
2015-11-07 06:08:46 +03:00
Razharas 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
Razharas 5e736281a7 Merge pull request #12871 from YotaXP/origin_tech_fix
Fixed bad `origin_tech` values.
2015-11-07 06:06:48 +03:00
Razharas 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
Razharas 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
JJRcop 17e034bf47 Changes chronosuit hands_nodrop_states to a bitfield from a list 2015-11-06 12:47:25 -05:00
Razharas 4892c79a0d Merge pull request #12862 from Robustin/master
Slows down nutrition loss in Slime People
2015-11-06 19:44:31 +03:00
Razharas 9e69eafef1 Merge pull request #12836 from KorPhaeron/chill
New dark blue slime reaction (fireproofing potion)
2015-11-06 19:42:17 +03:00
JJRcop 398f94ca6a Merge remote-tracking branch 'upstream/master' into chronosuit_phase_better 2015-11-06 00:01:26 -05:00
JJRcop 1c86a632f1 Chronosuit performance/saneness adjustments 2015-11-05 23:57:14 -05:00
Nerd Lord 3f3994f549 Overload lights no longer shocks through walls. 2015-11-05 20:36:04 -05:00
Nerd Lord 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
YotaXP 2ffc5f055c Fixed bad origin_tech values. 2015-11-05 15:32:25 -05:00
Razharas 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
Robustin aa848d0e4c Update species_types.dm 2015-11-05 11:08:06 -05:00
phil235 31ad6964de Fixes slimes not being detached from their victim when the victim starts bloodcrawling. 2015-11-05 16:56:11 +01:00
Cheridan 6555156399 Merge pull request #12812 from KorPhaeron/lasertag
Makes lasertag projectiles beams
2015-11-05 08:15:58 -06:00
KorPhaeron eaf87bb7f9 Burn state 2015-11-05 08:06:39 -06:00
Robustin fdf869fa0f Update species_types.dm 2015-11-04 17:24:28 -05:00
Razharas ed68f0bd1e Merge pull request #12813 from KorPhaeron/xenobio_fixes
Xenobio console fixes
2015-11-04 23:42:09 +03:00
Razharas 8ab8fa3767 Merge pull request #12819 from Incoming5643/slime_time_live
Little QoL thing for slimeperson splitting
2015-11-04 23:40:26 +03:00
Robustin 9fae7a2174 Update species_types.dm 2015-11-04 15:40:08 -05:00
Robustin 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
phil235 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
Cheridan 55e138c77d Merge pull request #12817 from Incoming5643/so_long_dental_plan
Dental implant fixes
2015-11-04 11:28:30 -06:00
blah 119d719e30 Fixes the two runtimes that was caused by the change 2015-11-04 14:42:50 +00:00
Cheridan fb3bbbee9c Merge pull request #12825 from xxalpha/resist
Fixed cyborgs not being able to unbuckle with alarm button
2015-11-03 23:05:59 -06:00
Shadowlight213 ef8598e7d1 Changes asay and dsay logging so they are seperate logging types. 2015-11-03 20:07:55 -08:00
Cheridan 064bff0edc Merge pull request #12826 from GunHog/WJs-How-To-Fix-Your-Xeno
Simple Animal Xeno Hunter Sprite Fix
2015-11-03 19:05:56 -06:00
blah 652e0114d7 Cleans up a tiny bit of changeling code that was copy pasted in monkey and human by merging it at carbon/life.dm 2015-11-03 22:50:51 +00:00
KorPhaeron 6f76380705 New dark blue slime reaction 2015-11-03 04:26:58 -06:00
Razharas 9df2bf8a45 Merge pull request #12750 from SuperSayu/auto_librarian
Adds database-fed random bookshelves.
2015-11-03 04:25:03 +03:00
Razharas cd1454a71c Merge pull request #12794 from kingofkosmos/altclickcheckfix
Alt+click checks fix
2015-11-03 04:19:38 +03:00
GunHog eed3116d43 Simple Animal Xeno Hunter Sprite Fix
- Fixes icon_state for simple mob alien hunter.
2015-11-02 19:19:33 -06:00
Razharas 46f17fecf5 Merge pull request #12802 from MrStonedOne/patch-58
Fixes shuttle docking ports being acted upon or pulled by the singulo
2015-11-03 02:19:47 +03:00
xxalpha c313bd2c46 Fixed buckled, handcuffed and legcuffed alert buttons not calling resist. 2015-11-02 18:57:52 +00:00
Incoming5643 c8b1fe81b5 I really need to stop coding at 3 am 2015-11-02 03:24:47 -05:00
Incoming 9ffa8ed82c Merge branch 'slime_time_live' of https://github.com/Incoming5643/-tg-station into slime_time_live 2015-11-02 03:08:39 -05:00
Incoming 5020846729 Shifting between bodies can't be done while unconscious, so this keeps slimepeople from jumping to already unconscious bodies so no one gets blindly trapped 2015-11-02 03:07:39 -05:00
KorPhaeron e60d0f9203 Fix for jordie 2015-11-02 00:43:33 -06:00
Incoming 30e8a39869 Checks work better when you actually check them.
Adds some low level logging for implanted pill use. If you want specific logging for when certain chemicals come into play, that's more a goofchem problem.

Fixes some grammer while I'm here
2015-11-02 01:12:48 -05:00
KorPhaeron e5f59edfae Xenobio fixes 2015-11-01 21:05:06 -06:00
KorPhaeron 015c480e8f Lasertag beams 2015-11-01 20:55:46 -06:00
Razharas 282dae922e Merge pull request #12762 from GunHog/Of-Scanners-And-Bugfixes
Research scanner fixes
2015-11-01 23:32:34 +03:00
Remie Richards ff8f62deb3 Merge pull request #12801 from KorPhaeron/KorPhaeron-patch-4
Monkey recycle fix
2015-11-01 20:28:49 +00:00
KorPhaeron 86b966e64f Fix 2015-11-01 14:19:57 -06:00
Kyle Spier-Swenson e7341d4384 Fixes shuttle docking ports being acted upon by the singulo
Fixes #12677
2015-11-01 12:03:50 -08:00