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
ea40dbdb90
Fixes rpgloot.dm by removing + and -
2015-11-04 16:01:32 +00:00
119d719e30
Fixes the two runtimes that was caused by the change
2015-11-04 14:42:50 +00:00
d77ad7a6f5
Fixes advanced camera resets.
2015-11-04 15:08:17 +01:00
6a8919197b
Flavour
2015-11-03 23:37:05 -06:00
c87c06411f
Ghost spawner
2015-11-03 23:25:36 -06:00
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
ef8598e7d1
Changes asay and dsay logging so they are seperate logging types.
2015-11-03 20:07:55 -08:00
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
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
b2f6de33b7
swaps button locations
2015-11-03 15:31:03 -06:00
6f76380705
New dark blue slime reaction
2015-11-03 04:26:58 -06:00
2d307e330e
makes sleepypens refillable
2015-11-02 17:41:35 -08:00
9df2bf8a45
Merge pull request #12750 from SuperSayu/auto_librarian
...
Adds database-fed random bookshelves.
2015-11-03 04:25:03 +03:00
cd1454a71c
Merge pull request #12794 from kingofkosmos/altclickcheckfix
...
Alt+click checks fix
2015-11-03 04:19:38 +03:00
eed3116d43
Simple Animal Xeno Hunter Sprite Fix
...
- Fixes icon_state for simple mob alien hunter.
2015-11-02 19:19:33 -06:00
d78301b012
Flower bud now inherits from alien/resin structures, so it can be attacked/exploded/blobbed/shot/etc.
2015-11-03 00:11:58 +00:00
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
c313bd2c46
Fixed buckled, handcuffed and legcuffed alert buttons not calling resist.
2015-11-02 18:57:52 +00:00
15bf91049e
Improves Beam() code, Adds a new spacevine mutation+mob
2015-11-02 11:35:22 +00:00
c8b1fe81b5
I really need to stop coding at 3 am
2015-11-02 03:24:47 -05:00
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
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
e60d0f9203
Fix for jordie
2015-11-02 00:43:33 -06:00
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
e2187614fd
Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
...
Conflicts:
code/__DEFINES/hud.dm
code/__HELPERS/game.dm
code/_onclick/hud/_defines.dm
code/_onclick/hud/hud.dm
code/game/gamemodes/antag_spawner.dm
code/game/gamemodes/game_mode.dm
code/game/machinery/turrets.dm
code/modules/client/preferences_toggles.dm
code/modules/events/alien_infestation.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/living/carbon/alien/special/alien_embryo.dm
code/modules/mob/living/simple_animal/revenant/revenant.dm
icons/mob/back.dmi
icons/mob/head.dmi
icons/mob/hud.dmi
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
icons/mob/mob.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/items.dmi
icons/obj/projectiles.dmi
icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
e5f59edfae
Xenobio fixes
2015-11-01 21:05:06 -06:00
015c480e8f
Lasertag beams
2015-11-01 20:55:46 -06:00
2484266f0b
Xray range
2015-11-01 16:53:57 -06:00
282dae922e
Merge pull request #12762 from GunHog/Of-Scanners-And-Bugfixes
...
Research scanner fixes
2015-11-01 23:32:34 +03:00
ff8f62deb3
Merge pull request #12801 from KorPhaeron/KorPhaeron-patch-4
...
Monkey recycle fix
2015-11-01 20:28:49 +00:00
86b966e64f
Fix
2015-11-01 14:19:57 -06:00
e7341d4384
Fixes shuttle docking ports being acted upon by the singulo
...
Fixes #12677
2015-11-01 12:03:50 -08:00
e4c307af79
You saw nothing
2015-11-01 11:40:14 -05:00
8acfb8db3c
Grumble grumble doesn't work in new must be in initialize
2015-11-01 11:40:13 -05:00
7bb3c14883
Error checking, consolidation, sql sanity
2015-11-01 11:40:13 -05:00
c1d3ddb6e7
Adds database-fed random bookshelves.
2015-11-01 11:40:12 -05:00
3951ccc3c3
Merge pull request #12771 from Jordie0608/totallyaspookyhalloweenchange
...
Removes ntsl investigate
2015-11-01 19:29:56 +03:00
0ad5714e5a
Merge pull request #12798 from KorPhaeron/KorPhaeron-patch-3
...
Xenobio cam hotfix
2015-11-01 19:06:06 +03:00
36d747acb6
Xenobio cam fix
2015-11-01 09:36:06 -06:00
Cheridan
KorPhaeron
Robustin
Razharas
phil235
blah
AnturK
KorPhaeron
Shadowlight213
AndrewJacksonThe2nd
GunHog
Remie Richards
xxalpha
Incoming5643
Incoming
Tkdrg
Kyle Spier-Swenson
Vincent