PsiOmega
cfb3bad3e2
Fixes #8498 .
...
Simple animals should now die properly when killed.
2015-03-16 13:46:08 +01:00
PsiOmega
a1cbc80ed3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-16 12:39:32 +01:00
Graham Lloyd
207a04a428
fixes the issue brought up on the PR.
2015-03-14 19:14:31 -04:00
PsiOmegaDelta
2925a296dc
Merge pull request #8470 from Neerti/3-13-2015_borg_hotkeys
...
Ports /tg/'s Cyborg Hotkeys
2015-03-14 19:04:36 +01:00
mwerezak
e6e0c87062
Aggressive grab auto hit only applies to close targets and melee attacks
2015-03-14 01:53:11 -04:00
mwerezak
812ff9869d
Implements projectile point blank damage multipliers for targets being grabbed.
2015-03-14 00:41:55 -04:00
Neerti
dc4d149832
Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys.
2015-03-13 21:41:23 -04:00
mwerezak
6a5dd6c89e
Aggressive grabs prevent missing with weapons
2015-03-13 21:30:18 -04:00
PsiOmega
190bff8b47
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-13 14:23:00 +01:00
PsiOmega
ac25b0a614
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-13 14:21:38 +01:00
PsiOmega
2efa9c78f0
Corrects pulling icon_states.
2015-03-13 11:02:18 +01:00
PsiOmega
fac4eb08e3
Alarm subsystem is now processed by the scheduler. Removes now dead code.
2015-03-13 10:36:47 +01:00
PsiOmega
ce30b00287
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/setup.dm
icons/mob/items_righthand.dmi
maps/exodus-1.dmm
maps/exodus-5.dmm
2015-03-13 09:23:26 +01:00
Zuhayr
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
Zuhayr
b5419a1673
Merge pull request #8443 from Baystation12/master
...
Master into dev-freeze.
2015-03-11 19:37:19 +10:30
PsiOmega
b00138aa42
Fixes #5787 .
...
The pull icon is now immediately displayed/hidden when one starts/stops pulling an objects.
Not stolen from https://github.com/tgstation/-tg-station/pull/8279 .
2015-03-10 18:01:27 +01:00
PsiOmega
533ccef0ab
Robot code clean up and fixes.
...
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
2015-03-10 13:37:20 +01:00
PsiOmega
85641b46e5
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-10 07:58:25 +01:00
Zuhayr
fb56784fcb
Merge pull request #8408 from mwerezak/examine-fix
...
Examine fix
2015-03-10 09:30:51 +10:30
PsiOmegaDelta
78d67a717a
Merge pull request #8384 from comma/spookycat
...
Gave Runtime spirit-sensing capabilities.
2015-03-09 21:17:23 +01:00
PsiOmegaDelta
668c4baee7
Merge pull request #8382 from comma/monkey_revenge
...
Allows you to scoop monkeys up
2015-03-09 21:17:03 +01:00
mwerezak
385ff4f2fa
Examine tab modularity
...
Also fixes antag info text sticking around if antag/observer status is lost
2015-03-09 12:09:18 -04:00
mwerezak
6bfa4ef3d5
Fixes AI freelook runtime
2015-03-09 11:59:02 -04:00
Chinsky
d8c2a36f9f
Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance
...
Mirror and ERT appearance improvement.
2015-03-09 13:42:19 +03:00
Loganbacca
11d340f898
Projectile effects - Part 3
...
- Fixes for turrets, rogue drones, and emitters
- Removed muzzle flash from chem darts
- Converted emitters to use spanclasses and have correct capitalization
2015-03-09 22:17:34 +13:00
Chinsky
5b7368e627
Merge pull request #8386 from volas/heartbeat
...
Heartbeat sound
2015-03-09 11:45:10 +03:00
mwerezak
a28378f819
Fixes space movement runtime
2015-03-09 03:32:18 -04:00
mwerezak
e5a9b686aa
Fixes human examine
...
Fixes issues introduced with the examine tab system by decoupling the
examine() proc from the code that updates a mob's description holders.
Puts a few things in more logical places.
2015-03-09 02:33:43 -04:00
mwerezak
b71f6c1121
Partial breathing refactor
...
Reorganizes breathing, and moves common human/monkey breathing code into
carbon. handle_breath() is largely unchanged.
Removes unnecessary handle_internal_lifeform().
Fixes monkies being held by people in mecha in space not being able to breathe.
2015-03-09 00:09:34 -04:00
Zuhayr
a508651115
Merge pull request #8381 from comma/mindfuck
...
More hallucinations mindufuckery
2015-03-09 03:23:36 +10:30
volas
3d55fc58b9
Additional checks for heartbeat, reduced volume
2015-03-08 19:27:31 +03:00
PsiOmega
44c7b2367a
Admin verbs and white/blacklisting or races.
...
Makes it possible for admins to bring out the appearance changer at will, controlled either by themselves or the mob in question.
Makes it possible to define custom race white/blacklisting in the appearance changer. However, this does not override the player's own racial restrictions.
2015-03-08 12:25:34 +01:00
GinjaNinja32
9888120b05
Fix simple-animal grabbing
2015-03-08 11:21:38 +00:00
PsiOmega
c6b0370b6a
Mirror and ERT appearance improvement.
...
NanoUI-based appearance changer, with flags to set exactly which parts of the appearance which can be changed.
2015-03-07 23:11:00 +01:00
volas
cef52c73f8
Heartbeat
2015-03-07 18:03:49 +03:00
Chinsky
64f42d592c
Gave Runtime spirit-sensing capabilites. Every tick there's a 2% chance she'd stare at a place where ghost is.
2015-03-07 16:48:21 +03:00
Chinsky
f3b6c65038
Added new hallucinations effect - spinning. Changes client dir for 3-5 second for a /real/ mindbreaking. Minor sprite oddities that appear in that mode shouldn't be an issue if you are hallucinating and only last for few seconds anyway.
2015-03-07 16:23:31 +03:00
Chinsky
b730e8309e
Fixed monkeys suffocating. Also monkeys with harm in mind are not scoopable now for balance.
2015-03-07 16:03:43 +03:00
Chinsky
fae7d1c9e9
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge
...
Conflicts:
code/modules/mob/holder.dm
code/modules/mob/living/carbon/monkey/monkey.dm
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2015-03-07 15:18:54 +03:00
Zuhayr
3895349787
Merge pull request #8374 from Baystation12/dev-freeze
...
Dev freeze into dev
2015-03-07 12:05:32 +10:30
Zuhayr
ac860b976a
Fixing compile issues, adjusted buckle code after a weird merge.
2015-03-07 11:52:14 +10:30
Zuhayr
9f1e04aa50
Thanks TortoiseGit.
2015-03-07 11:40:00 +10:30
Zuhayr
1984ef6e51
Master into dev-freeze.
2015-03-07 11:33:39 +10:30
PsiOmega
0262ab0de0
Runtime fixes
...
Fixes
````
runtime error: Cannot read null.name
proc name: sql report cyborg death (/proc/sql_report_cyborg_death)
source file: statistics.dm,87
usr: the maintenance drone (106) (/mob/living/silicon/robot/drone)
src: null
````
````
runtime error: Cannot read null.name
proc name: sql report death (/proc/sql_report_death)
source file: statistics.dm,52
usr: null
src: null
````
````
runtime error: Cannot read null.armor
proc name: infection check (/proc/infection_check)
source file: helpers.dm,16
usr: null
src: null
````
````
runtime error: bad client
proc name: open (/datum/nanoui/proc/open)
source file: nanoui.dm,419
usr: null
src: /datum/nanoui (/datum/nanoui)
/datum/nanoui (/datum/nanoui): open()
````
````
runtime error: undefined variable /obj/effect/plantsegment/var/movable
proc name: update canmove (/mob/proc/update_canmove)
source file: mob.dm,862
usr: null
src: the monkey (643) (/mob/living/carbon/monkey)
````
2015-03-06 18:39:44 +01:00
Daniel García Baldomir
94477bd66c
Minor fixes on the overlays. Made holosigns functional again.
2015-03-05 21:47:26 +01:00
PsiOmega
3e9f33136a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/effects/decals/Cleanable/fuel.dm
maps/exodus-5.dmm
2015-03-05 09:20:20 +01:00
PsiOmega
173f0527eb
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/nano/nanomanager.dm
code/modules/surgery/surgery.dm
2015-03-05 08:05:44 +01:00
Graham Lloyd
7420463f73
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-03-04 05:15:27 -05:00
Graham Lloyd
160183ebd5
finishes work on adapting the goon process scheduler for BS12.
2015-03-04 05:14:36 -05:00
mwerezak
f8831fa513
Adjusts human temperature damage intervals
2015-03-03 19:31:01 -05:00
