Commit Graph

11520 Commits

Author SHA1 Message Date
Chinsky
c837505e8b Merge pull request #8328 from PsiOmegaDelta/LessIsMore
Cleans up access handling.
2015-03-03 10:21:16 +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
mwerezak
1a4cedd412 Fixes #7363 2015-03-02 13:24:52 -05:00
PsiOmega
318f5e1a92 Cleans up access handling. 2015-03-02 18:55:03 +01:00
PsiOmega
98be5cbce8 Synth medical sensors now report dead/alive status.
Synths with medical augmentation sensors enabled will now see the dead/alive status of crew members with suit sensors set to at least binary level.
2015-03-02 13:04:02 +01: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
GinjaNinja32
30cfa30c73 Absolute paths 2015-03-02 02:38:12 +00:00
GinjaNinja32
c3388020ff Reagent dispenser rework 2015-03-02 02:25:32 +00:00
PsiOmega
02a1e1d129 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/light.dm
2015-03-01 21:15:47 +01: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
Chinsky
2cb18ac23f Merge pull request #8311 from PsiOmegaDelta/AllTheNano
Turret NanoUI interfaces
2015-02-28 19:51:13 +03:00
Zuhayr
b3bae8a509 Split language.dm across multiple files. 2015-03-01 02:01:43 +10:30
Zuhayr
e2f69bd6cd Moves language.dm into its own folder. 2015-03-01 02:01:37 +10:30
PsiOmega
00becda446 Few Fixes.
Fixes #8304.
Fixes #8306.
2015-02-28 14:29:30 +01:00
PsiOmega
683ef229c1 NanoUI interfaces.
Turret Controls.
Omni-filters/mixers now disable the On/Off button during configuration.
2015-02-28 13:21:08 +01:00
Zuhayr
64b33c43db Refactors some job variables from the Economy file (what the fuck) and swaps created types for lists in bot access assignment. 2015-02-28 20:20:19 +10:30
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
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
c659ebefde Fixes #8176 2015-02-28 16:47:27 +10:30
Zuhayr
53e59cbf94 Fixes #8126 2015-02-28 16:47:08 +10:30
Zuhayr
3bf7d1446c Fixes #8285 2015-02-28 16:45:18 +10:30
Zuhayr
d0451eaa2d Fixes #8249 2015-02-28 16:30:34 +10:30
Zuhayr
bead2896bb Merge pull request #8296 from comma/master
Fixes #8270
2015-02-28 16:28:05 +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
5d2f492386 Fixes #8265. Moves the print report link being added to the window to after the data is saved for printing. 2015-02-27 18:09:09 -05:00
Mustafa Kalash
14f76324b9 Fixes #8231. Adds on_hear_radio proc for observers to add tracking. 2015-02-27 17:18:47 -05:00
Chinsky
3d95981394 Fixes #8270
Fixes part where alcohol potency was doubled and halves drinking glass volume so it won't hold a half of a bottle.
Also set bottle/shaker volumes to new 30u base most reagent containers like beakers/bottles use nowdays as requested.
2015-02-27 13:40:37 +03:00
Chinsky
7f01af6b7d Merge pull request #8297 from PsiOmegaDelta/CameraCoverage
Camera coverage fixes.
2015-02-27 13:11:21 +03:00