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
Zuhayr
b62a6dc76d
Merge pull request #8354 from PsiOmegaDelta/Jaunt
...
Fixes #8342 .
2015-03-05 12:47:01 +10:30
Zuhayr
b4b43a6206
Merge pull request #8350 from PsiOmegaDelta/NanoRuntime
...
Fixes NanoUI transfer runtime.
2015-03-05 09:19:41 +10:30
Zuhayr
44620e2d8d
Merge pull request #8351 from PsiOmegaDelta/BlobMove
...
Fixes #8348 .
2015-03-05 09:19:25 +10:30
PsiOmegaDelta
de2bd8979f
Merge pull request #8356 from Raptor1628/dev-freeze
...
Fixes and adjustments
2015-03-04 20:10:04 +01:00
Raptor1628
cf0e526d91
Fixes and adjustments
...
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
2015-03-04 11:18:40 -05:00
PsiOmega
8feec5760f
Fixes #8342 .
...
Secbots now continually checks if their target remains in sight before bashing the head in.
2015-03-04 16:54:07 +01:00
PsiOmegaDelta
7d3c01c51e
Merge pull request #8341 from mwerezak/temperature-fix
...
Fixes #7363
2015-03-04 12:40:54 +01:00
PsiOmegaDelta
6799569d16
Merge pull request #8344 from comma/surgeryfixies
...
Surgerything
2015-03-04 11:00:22 +01:00
PsiOmega
fb09009016
Fixes #8348 .
...
Relocates blob start to adjacent turf, allowing it to act upon (and destroy) the previously weapon blocking emergency shutter.
2015-03-04 09:53:15 +01:00
PsiOmega
05c487ca8f
Fixes NanoUI transfer runtime.
...
No longer unconditionally attempts to transfer NanoUIs from one mob to another.
Previously caused runtimes if the source-mob was gibbed or otherwise destroyed.
2015-03-04 09:46:49 +01:00
mwerezak
f8831fa513
Adjusts human temperature damage intervals
2015-03-03 19:31:01 -05:00
Chinsky
43cc464c28
Merge pull request #8346 from PsiOmegaDelta/Fuel
...
Fixes #8343
2015-03-03 23:55:06 +03:00
PsiOmega
8f929331d8
Fixes #8343
...
Fuel no longer attempts to spread itself after having been deleted.
2015-03-03 15:33:15 +01:00
Chinsky
b0be5a90ff
Fixed exploit that allowed you to apply surgery step to any zone regardless of where you state it. For example it allows you to cut off heads, groins and even torsos by starting to cut off limb and then switching to other zone. Also now surgery lock is area-based, so more than one surgeon can work on different organs at same time.
2015-03-03 13:37:26 +03:00
Chinsky
9be2b8d64c
Merge pull request #8330 from PsiOmegaDelta/Access
...
Increased check_rights flexibility.
2015-03-03 10:21:11 +03:00
Snapshot
68d206be6a
Merge pull request #8329 from PsiOmegaDelta/Smile
...
Fixes #8322 .
2015-03-02 18:36:46 -08:00
Zuhayr
6affacb983
Merge pull request #8337 from PsiOmegaDelta/Map
...
Fixes #8334 .
2015-03-03 11:58:35 +10:30
mwerezak
1a4cedd412
Fixes #7363
2015-03-02 13:24:52 -05:00
PsiOmega
a11c7ba1c7
Fixes #8334 .
...
Removes references to the load_speed argument in load_map as it doesn't actually exist.
For some reason the dmm_suit injects itself as an argument in airlocks. Putting a band-aid on the symptom.
2015-03-02 11:42:40 +01:00
Chinsky
bea2d336bb
Merge pull request #8313 from MrSnapwalk/peiconupdate
...
Updates /obj/item/clothing/under/fluff/parkereliza with better sprites.
2015-03-02 07:46:57 +03:00
PsiOmegaDelta
1acfce9b29
Merge pull request #8332 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-03-01 21:14:34 +01:00
PsiOmega
cf11fad8bc
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-01 21:13:38 +01:00
Chinsky
a783e7fd52
Merge pull request #8325 from GinjaNinja32/vines
...
Properly fixes vines pulling through windoors
2015-03-01 22:29:21 +03:00
PsiOmega
df689a4f72
Increased check_rights flexibility.
...
NanoUI interfaces no longer appear locked when admin observers look at them for too long.
2015-03-01 15:29:17 +01:00
PsiOmega
bdce7a8e41
Fixes #8322 .
...
When copying a photo new instances are created of relevant icons, instead of referencing them.
2015-03-01 15:21:15 +01:00
Snapshot
413b085994
Merge pull request #8323 from PsiOmegaDelta/NanoDistance
...
Fixes issue with borg remote access.
2015-02-28 20:17:36 -08:00
Snapshot
c1108b2ad2
Merge pull request #8318 from mwerezak/hardsuit-emp
...
Hardsuit fixes, tweaks, EMP effects
2015-02-28 20:16:36 -08:00
GinjaNinja32
34e30fd76a
Properly fixes vines pulling through windoors
2015-02-28 21:35:29 +00:00
PsiOmega
65e01c50c1
Fixes issue with borg remote access.
...
Borgs had better remote access than even the AI, ignoring all distances if viewing through cameras.
Introducing view limit.
2015-02-28 20:47:27 +01:00
mwerezak
8d1a92a0f5
Hardsuit tweaks
...
Spider fang blade uses power faster.
Light hardsuits (minus ninja suit) have voidsuit-level breach thresholds.
If the suit is malfunctioning when it runs out of power then you will need someone to cut you out.
2015-02-28 14:04:53 -05:00
PsiOmegaDelta
11070d62d7
Merge pull request #8316 from Zuhayr/dev-freeze
...
Fixes
2015-02-28 17:53:27 +01:00
Chinsky
1d38246cc1
Merge pull request #8320 from PsiOmegaDelta/MastefulFixes
...
A Few Fixes.
2015-02-28 19:50:38 +03:00
PsiOmega
00becda446
Few Fixes.
...
Fixes #8304 .
Fixes #8306 .
2015-02-28 14:29:30 +01:00
mwerezak
a026922115
More hardsuit fixes, ion rifle fix
...
Fixes modules being usable when destroyed.
Fixes charge display for fractional charge values.
Fixes ion rifles EMPing themselves.
2015-02-28 04:15:29 -05:00
mwerezak
7dd82f8763
Merge remote-tracking branch 'upstream/dev-freeze' into backup
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
code/modules/clothing/spacesuits/rig/rig_pieces.dm
2015-02-28 03:39:38 -05:00
mwerezak
55a3b94995
Hardsuit adjustments, fixes
...
Default inherited offline_slowdown set to 3, as most hardsuits use this
value. ERT no longer get rad immunity, they have enough advantages -
instead only ERT engineers get that.
ERT engineer gauntlets are also now insulated, allowing them to do
wiring work in space.
Fixed a compile error.
Fixed mounted laser cannons taking too long to recharge.
2015-02-28 03:36:00 -05:00
mwerezak
a8c315ad52
Updates rig emp_act
...
EMPing hardsuits drains a bit of charge. Module damage is dealt to
damaged modules first. Various other adjustments.
2015-02-28 03:17:47 -05:00
Zuhayr
38d959e9f8
Should fix light level reporting.
2015-02-28 17:34:31 +10:30
Zuhayr
0beb6259f6
Partial fix for #8068 .
2015-02-28 17:29:26 +10:30
Zuhayr
273a9e2480
Should stop plants spreading through diagonal windows.
2015-02-28 17:20:49 +10:30
Zuhayr
b572763f77
Fixes #8253
2015-02-28 17:19:21 +10:30
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
7c2678c9ed
Merge pull request #8317 from Baystation12/master
...
Master into dev-freeze
2015-02-28 17:01:42 +10:30
Zuhayr
227fda7b4c
Fixes #8245
2015-02-28 16:59:37 +10:30
Zuhayr
71ecceec9e
Fixes #8226
2015-02-28 16:51:37 +10:30
Zuhayr
4b15f1a249
Fixes #7877
2015-02-28 16:47:41 +10:30
Zuhayr
c659ebefde
Fixes #8176
2015-02-28 16:47:27 +10:30
Zuhayr
53e59cbf94
Fixes #8126
2015-02-28 16:47:08 +10:30
