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
0a99df38ed
Merge pull request #12295 from AnturK/weregoats
...
Shapeshift Spell
2015-11-04 17:10:27 +03:00
d77ad7a6f5
Fixes advanced camera resets.
2015-11-04 15:08:17 +01:00
d977085883
Proper category for shapeshift
2015-11-04 12:54:24 +01:00
46da6c62c5
Preferences
2015-11-04 02:28:31 -06: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
ac6dfefa46
Merge pull request #12810 from tkdrg/zomgfast
...
Sped up recursive_hear_check. Again.
2015-11-03 12:59:00 +01:00
6f76380705
New dark blue slime reaction
2015-11-03 04:26:58 -06:00
555c37625b
Adds force and armour_penetriation to the supermatter sword
2015-11-03 02:47:26 -05:00
71f9bbbfe5
Fixes to fixes
2015-11-02 21:26:46 -08:00
906f49b089
lowers stun time of dihydrogen monoxide, still fatal if slipped on too many times
2015-11-03 00:03:41 -05: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
ea42f2d43f
Merge pull request #12780 from AnturK/nukekitfix
...
Fixes one nuke kit per round.
2015-11-02 19:15:59 -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
e186df4861
Merge pull request #12803 from MrStonedOne/patch-59
...
Makes round start spawn code more robust
2015-11-03 00:24:39 +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
2805d4becb
Fixes runtimes in Dna console, message monitor, and igniter
2015-11-01 23:19:23 -08: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
4754ffd770
Merge pull request #12788 from Incoming5643/80_win_rate
...
Unbreaks Rev
2015-11-02 05:05:08 +00: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
f136955d80
Created a new flashbang sound and a ringing effect for when you go deaf, very realistic, it's almost like your ears are actually bleeding (NOTE: that is a joke, this isn't actually a painful sound, i checked)
2015-11-01 18:51:00 -08:00
e647bf6b66
Sped up recursive_hear_check. Again.
...
For real this time. This is the laggiest thing after atmos and lighting
so it deserves a little love. Thanks a lot MrPerson, remie and oranges
for the help optimizing this on IRC.
2015-11-01 22:50:44 -03:00
150c25b810
Shapeshift Spell
2015-11-02 00:28:58 +01:00
47d1d57a69
Removes spam
2015-11-01 17:04:49 -06:00
2484266f0b
Xray range
2015-11-01 16:53:57 -06:00
3cd68567ab
Merge pull request #12754 from KorPhaeron/headsets
...
Adds normal captains headset to captains locker
2015-11-02 01:35:25 +03:00
046948f314
Merge pull request #12630 from KorPhaeron/Reflector
...
Laser Reflector Structure
2015-11-01 21:46:29 +00:00
99cc8aca9a
Proper istype
2015-11-01 15:36:28 -06:00
d704f37480
Fixes indenting in EquipRank
2015-11-01 12:56:02 -08:00
282dae922e
Merge pull request #12762 from GunHog/Of-Scanners-And-Bugfixes
...
Research scanner fixes
2015-11-01 23:32:34 +03:00
7b0a04e28f
Makes round start spawn code more robust
...
For finding a spawn point, it will now use this logic to find a spawn point, stopping at the first one it finds
Empty job spawn point
Filled up job spawn point (spawning them on top of eachother if it can't find enough spawn points)
Late join spawn point
Random tile in the arrivals shuttle area.
If it hits either of those two final points it will pop a message in the runtime log.
2015-11-01 12:29:28 -08:00
blah
Razharas
AnturK
KorPhaeron
Cheridan
Shadowlight213
KorPhaeron
Swag McYolosteinen
Incoming5643
MMMiracles
AndrewJacksonThe2nd
GunHog
Remie Richards
xxalpha
Incoming
Tkdrg
Cuboos
Kyle Spier-Swenson