Chinsky
d3b202db4d
Merge pull request #8512 from Zuhayr/dev-freeze
...
Fixes.
2015-03-17 14:19:59 +03:00
PsiOmega
018bd4ebdd
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-17 12:01:09 +01:00
Zuhayr
beaba0b88f
Fixes #8440
2015-03-17 19:35:25 +10:30
Zuhayr
b766f9efcf
Fixes #8378
2015-03-17 19:20:33 +10:30
Zuhayr
0267f156b5
Fixes #8446
2015-03-17 19:17:36 +10:30
Zuhayr
1f1fe76ec6
Fixes #8495
2015-03-17 19:16:56 +10:30
PsiOmega
cfb3bad3e2
Fixes #8498 .
...
Simple animals should now die properly when killed.
2015-03-16 13:46:08 +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
mwerezak
6a5dd6c89e
Aggressive grabs prevent missing with weapons
2015-03-13 21:30:18 -04: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
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
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
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
GinjaNinja32
9888120b05
Fix simple-animal grabbing
2015-03-08 11:21:38 +00:00
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
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
mwerezak
f8831fa513
Adjusts human temperature damage intervals
2015-03-03 19:31:01 -05:00
mwerezak
1a4cedd412
Fixes #7363
2015-03-02 13:24:52 -05:00
PsiOmega
cf11fad8bc
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-01 21:13:38 +01:00
PsiOmega
00becda446
Few Fixes.
...
Fixes #8304 .
Fixes #8306 .
2015-02-28 14:29:30 +01:00
Zuhayr
a0452f3423
Alternative fix for golem damage.
2015-02-28 17:08:30 +10:30
Zuhayr
14321003f1
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2015-02-28 17:04:22 +10:30
Zuhayr
c659ebefde
Fixes #8176
2015-02-28 16:47:27 +10:30
Zuhayr
172cecaa80
Merge pull request #8305 from DJSnapshot/dev-freeze
...
gets rid of MC tab. Returns it back to status tab.
2015-02-28 16:27:20 +10:30
Zuhayr
f7983e7732
Merge pull request #8293 from comma/interfacefix
...
Couple fixes
2015-02-28 16:22:36 +10:30
Zuhayr
5ec131fa32
Merge pull request #8312 from hockeygoalie5/fixes
...
Fixes #8255 , #8231 , #8265
2015-02-28 12:14:15 +10:30
Mustafa Kalash
14f76324b9
Fixes #8231 . Adds on_hear_radio proc for observers to add tracking.
2015-02-27 17:18:47 -05:00
Chinsky
7f01af6b7d
Merge pull request #8297 from PsiOmegaDelta/CameraCoverage
...
Camera coverage fixes.
2015-02-27 13:11:21 +03:00
PsiOmega
7e498e1cf7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/hydroponics/seed_datums.dm
code/modules/hydroponics/trays/tray_apiary.dm
code/modules/power/apc.dm
code/setup.dm
2015-02-27 09:06:48 +01:00
DJSnapshot
12024f07aa
gets rid of MC tab. Returns it back to status tab.
2015-02-26 15:32:10 -08:00
PsiOmega
98f6a4cae5
Camera coverage fixes.
...
Fixes issues with AI cameras coverage not updating properly in several instances during EMPs, destruction, etc.,
2015-02-26 11:39:41 +01:00
Chinsky
3ba56d7f76
Alt-arrow in same direction you are set to face now resets facing direction.
2015-02-26 11:56:43 +03:00
Zuhayr
a9d23df3ff
Merge pull request #8279 from PsiOmegaDelta/CameraNet
...
Fixes camera network changes not always being reflected in camera consoles.
2015-02-26 16:28:49 +10:30
PsiOmega
4dca85b17c
Fixes camera network changes not always being reflected in camera consoles.
...
Cameras with altered networks would not necessarily show up on camera consoles, primarily affecting cameras joining/leaving alarm zones.
2015-02-25 19:50:07 +01:00
PsiOmega
768faa4bf0
Fixes #8266 .
...
Ensures drones get access to the alarm monitor subsystem.
Restores the Show Alerts link in alarm notices.
2015-02-25 09:07:04 +01:00
mwerezak
401709cd23
Merge remote-tracking branch 'upstream/dev-freeze' into gun-rewrite
2015-02-24 20:15:18 -05:00
mwerezak
5124055663
Fixes #8243
...
Didn't want to have to generate even more lists so this is what you get.
2015-02-24 19:42:24 -05:00
Zuhayr
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
