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
f618a4690b
Merge pull request #12752 from KorPhaeron/xenobiology2
...
Xenobiology Control Console
2015-11-01 18:30:34 +03:00
5ba4e04027
Merge pull request #12646 from Shadowlight213/OOCban
...
Adds the ability to ban someone from OOC
2015-11-01 15:43:55 +03:00
e75d24a6c9
Changes checks in altclicks from canusetopic to incapacitated.
2015-11-01 11:24:17 +02:00
d2f3b0fd4a
fixes critical bugs
...
finishes -> finshes
arms -> arm
sorry for clogging commits :(
2015-11-01 01:23:14 -08:00
cb55c84c35
changes messages to be more clear
...
I forgot to change the messages to make them more clear, they were previously "checking for a chainsaw" since the way i checked for chainsaws was much more hacky in the original version of this code
2015-11-01 01:18:44 -08:00
a9cb60d690
adds removing chainsaws + indentation cleanup
...
changes indenting on chainsaw augmentation from a bunch of spaces to nice and neat tabs
adds a surgery to remove surgically attached chainsaws
2015-11-01 01:58:34 -07:00
8a9f2c70c8
Remove lizard
2015-11-01 01:45:03 -06:00
3c20526900
Re-adds dethralling surgery and speeds up enthralling
2015-11-01 01:39:01 -04:00
3e3aa2ee9f
Merge pull request #12748 from MrStonedOne/sweetsweetdimlight
...
[Pretty Pictures!] [map] Makes starlight have far spreading low levels of light rather than near spreading high levels of light.
2015-10-31 22:22:39 -05:00
5a781f93df
Merge remote-tracking branch 'refs/remotes/tgstation/master' into xenobiology2
2015-10-31 21:47:10 -05:00
122796dfb7
Merge pull request #12726 from MrPerson/delay_of_game_5_yard_penalty_repeat_first_down
...
Refactor mob movement delay calculation
2015-11-01 02:04:44 +03:00
8b2fec9281
Icons, monkey recycle
2015-10-31 17:56:29 -05:00
6d437a4d52
Merge pull request #12728 from GunHog/Hardsuits-are-cool
...
RAD/EMP/Bomb Hardsuit messages
2015-10-31 17:27:31 -05:00
a7334f95b6
Adds POI List, makes orbit use it.
2015-10-31 20:02:06 +01:00
aa3198afd1
Merge pull request #12749 from GunHog/This-is-why-you-remember-to-SYNC!
...
Missing Diagnostic HUDs commit
2015-10-31 21:37:29 +03:00
494de26abb
Magnitide -> Magnitude
2015-10-31 10:37:37 -05:00
55021fc27d
Conflicts 2/2
2015-10-31 11:32:12 -04:00
f2291a1194
Shadowling update 5
2015-10-31 11:30:29 -04:00
615275f71f
Merge pull request #12496 from kingofkosmos/interactivescreenalerts
...
More interactive screen alerts and workarounds for the resist-button
2015-10-31 15:13:15 +03:00
1e3aa40015
Merge pull request #12714 from MrPerson/lastarea's_last_ride
...
Removes the unused lastarea mob var
2015-10-31 15:05:40 +03:00
381f3bb8ad
Merge pull request #12718 from Incoming5643/so_long_dental_plan
...
Adds dental implant surgery
2015-10-31 15:05:28 +03:00
8c755da84f
Adds a way to make certain area/space areas not force 100% brightness
2015-10-31 02:30:49 -07:00
AndrewJacksonThe2nd
Razharas
GunHog
Remie Richards
xxalpha
Incoming5643
Incoming
KorPhaeron
Tkdrg
KorPhaeron
Kyle Spier-Swenson
Vincent
kingofkosmos
PKPenguin321
Xhuis
Cheridan
AnturK
GunHog