565e39a28f
Porting forensics from Aurora.
2015-12-10 19:16:28 +10:30
c4d6a76887
Merge pull request #11649 from Baystation12/master
...
Dev-freeze
2015-12-10 08:21:43 +01:00
e1694c40fe
Merge pull request #483 from Hubblenaut/ttv
...
Ports Bay Fixes for TTV Yield
2015-12-09 22:30:25 -05:00
e9cdc8a0f5
Fixes #9257
2015-12-10 11:57:34 +10:30
7a9d7bf0c9
Fixes #10753
2015-12-10 10:41:48 +10:30
f1630108db
Fixes #10915
2015-12-10 10:32:35 +10:30
d5447d9e95
Fixes #10838
2015-12-10 10:23:49 +10:30
d6514ff2f2
Merge pull request #11646 from Ccomp5950/ninja_VANISH
...
Ninjas teleporter: Checks Z levels and distance.
2015-12-10 09:54:49 +10:30
f6f6a4ef87
Ninjas teleporter: Checks Z levels and distance.
...
Ninjas are able to use a camera console and teleport across the map. This resolves that.
2015-12-09 17:27:27 -05:00
1a46db4aaf
fix #11637
2015-12-09 17:04:24 +00:00
12b9d30923
Gear loadout sanity checking.
...
Adds gear loadout sanity checking to reduce the risk of https://github.com/PolarisSS13/Polaris/issues/376 from happening, as well as ' /datum/'.
2015-12-09 12:27:41 +01:00
e573581a28
Merge pull request #496 from Woodratt/1.2.6_Bar_Signs_and_Power
...
1.2.6 Bar Sign and Power tweaks
2015-12-09 03:41:48 -05:00
b1735a3063
1.2.6 Bar Sign and Power tweaks
...
- Created prescription Huds for medical and security. Two exist in the medical exam room, two in the security restroom.
- Boot Knives Bar Sign
- Tactical light in the warehouse replaced with a more low speed option
- Adjusted Atmos SMES to input from round start
- Adjusted Main SMES to start with about 70% power and a 700k Output.
2015-12-09 00:21:26 -08:00
894ad58277
Fixes people spawning in space.
...
People were spawning in space due to a runtime error that occured when they choose the orange scarf, because the loadout entry lacked a path variable.
2015-12-09 02:50:51 -05:00
a9d3f02cd5
Updates preset TTV bombs, adds debug verb
2015-12-08 18:15:55 +01:00
183ac02f32
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
...
Conflicts:
html/changelogs/Hubblenaut-dev.yml
2015-12-08 15:50:00 +01:00
baec8f15d1
Changes to Pushing Mechanics
2015-12-08 15:15:00 +01:00
c56e6d173c
Merge pull request #463 from Sabess/master
...
Added more reskins for the M1911 and some other stuff.
2015-12-08 08:15:19 -05:00
0b76c62a8d
Merge pull request #11632 from Ccomp5950/fix_nvgs_and_shit_that_changes_see_invis
...
Fixes NVGs and other items that change see_invis.
2015-12-08 08:13:45 +00:00
0f986b0098
Compilation fixes.
2015-12-08 08:10:59 +01:00
5fcf13ac55
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/surgery_limbattachment.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/organs/organ.dm
code/modules/organs/organ_external.dm
code/setup.dm
2015-12-08 08:09:37 +01:00
c919aabfd5
Fixes NVGs and other items that change see_invis.
...
I blame a bad merge or something. There is no reason for vision changes to be made in this part of the code.
2015-12-08 01:05:46 -05:00
897e6c8382
Fixes some clothes.
2015-12-07 22:49:32 -05:00
2dc59a5c96
Merge pull request #469 from EmperorJon/07_Dec._Fix_SMG_desc
...
Changes 12mm to 10mm.
2015-12-07 23:59:50 +00:00
ef987c5124
Changes 12mm to 10mm.
2015-12-07 23:59:11 +00:00
1e5d6f9f57
Merge pull request #11567 from PsiOmegaDelta/151202-PlasmaCuttingPower
...
Adds energy costs to some rig equipment.
2015-12-07 19:58:19 +03:00
050c1f631a
Added a missing update_icon()
2015-12-07 11:27:33 +00:00
c2eba995ac
Merge pull request #11604 from mwerezak/organ-tag-fix
...
Organ fixes
2015-12-07 19:13:09 +10:30
f219980a3d
Fixed merge conflicts causing lack of compilation hopefully.
2015-12-07 03:38:38 -05:00
a1203ed942
Fixes the broken Antag Uplink.
...
NanoUI re-assigns src_object, rather than merely acquiring the host, causing ui_interact() updates to be called on the wrong object.
Fixes #11607 .
2015-12-07 03:06:56 -05:00
15cc546556
Backports NanoUI fixes from dev.
...
Fixes #11579 .
Conflicts:
code/modules/nano/modules/crew_monitor.dm
2015-12-07 03:05:39 -05:00
9db4ba1da0
Adds a remote interaction state for NanoUI.
...
This state has two checks:
A preliminary check of the remote target, ensuring it's powered, etc. If the remote target is fully disabled, it closes the window and conducts no further checks.
It then makes a full check, ensuring that the mob is capable, within range of the source remoting to the remote target, etc.
Unlike most other static interaction states, whoever initializes the remote state is responsible for deleting it properly.
Conflicts:
polaris.dme
2015-12-07 02:56:43 -05:00
443a376848
Ghosts can now view any object with a NanoUI interface.
...
However, ghosts can now also only view objects in range to ensure that the NanoUI window count is kept low.
Admins do not suffer this restriction and may also interact with these windows.
2015-12-07 02:35:33 -05:00
2847d9a7ef
Prepares for cherrypicking.
2015-12-07 02:35:20 -05:00
7e0a8f9145
Fixed notes, oops
2015-12-07 18:31:53 +11:00
76a11a1fd0
Fixed stuff
2015-12-07 18:11:17 +11:00
4ecddd7e8b
Adds attack_ghost() to base atmospherics object and APC to allow ghosts to see the nanoUI, and for admins to modify the objects from the interface.
2015-12-07 02:06:25 -05:00
47a6e38a8d
Added more reskins for the M1911, all of which have different sprites when empty. Added this functionality for the default M1911 as well as the default MK58s.
2015-12-07 14:25:06 +11:00
6299f9cc13
Fixes the broken Antag Uplink.
...
NanoUI re-assigns src_object, rather than merely acquiring the host, causing ui_interact() updates to be called on the wrong object.
Fixes #11607 .
2015-12-06 16:24:40 +01:00
e54280b460
Merge pull request #437 from Yoshax/master
...
Adds ability to smash drinking bottles on things other than people
2015-12-06 09:15:46 -05:00
da946eda99
Adds energy costs to some rig equipment.
...
Plasma cutter - 5 units
Drill - 1 unit
2015-12-06 13:30:28 +01:00
457c40d46f
Fixes #448 and #401 , custom loadout edit.
2015-12-06 06:26:06 -05:00
6a22086c17
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/verbs/suicide.dm
code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
85bb2778d0
Merge pull request #11610 from mwerezak/suicide-logging
...
Fixes #11466
2015-12-06 10:23:31 +00:00
39ab31cbf8
Removes unused ORGAN_ATTACHABLE define
2015-12-06 04:34:33 -05:00
9135a609cb
Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468
2015-12-06 04:17:52 -05:00
5de9314803
Clears reference to parent when removing external organs
2015-12-06 03:57:15 -05:00
2312631508
Fixes #11510
...
Splashing and external transfer now checks if the container is open
2015-12-06 02:49:46 -05:00
d508893e3c
Tweaks pointblank multipliers to play better with droplimb thresholds
2015-12-06 02:44:09 -05:00
29192fd8e8
Fixes #11466
2015-12-06 02:35:18 -05:00
Zuhayr