cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 09:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,286 Commits 2 Branches 1 Tag
c4d6a7688731dba343ba872d73311aad1bbe9679
Commit Graph

12453 Commits

Author SHA1 Message Date
PsiOmegaDelta
c4d6a76887 Merge pull request #11649 from Baystation12/master 
Dev-freeze
 2015-12-10 08:21:43 +01:00
Zuhayr
d6514ff2f2 Merge pull request #11646 from Ccomp5950/ninja_VANISH 
Ninjas teleporter:  Checks Z levels and distance.
 2015-12-10 09:54:49 +10:30
ccomp5950
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
GinjaNinja32
1a46db4aaf fix #11637 2015-12-09 17:04:24 +00:00
PsiOmegaDelta
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
GinjaNinja32
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
PsiOmegaDelta
0f986b0098 Compilation fixes. 2015-12-08 08:10:59 +01:00
PsiOmegaDelta
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
ccomp5950
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
Chinsky
1e5d6f9f57 Merge pull request #11567 from PsiOmegaDelta/151202-PlasmaCuttingPower 
Adds energy costs to some rig equipment.
 2015-12-07 19:58:19 +03:00
BlueNexus
050c1f631a Added a missing update_icon() 2015-12-07 11:27:33 +00:00
Zuhayr
c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix 
Organ fixes
 2015-12-07 19:13:09 +10:30
PsiOmegaDelta
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
PsiOmegaDelta
da946eda99 Adds energy costs to some rig equipment. 
Plasma cutter - 5 units
Drill - 1 unit
 2015-12-06 13:30:28 +01:00
PsiOmegaDelta
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
GinjaNinja32
85bb2778d0 Merge pull request #11610 from mwerezak/suicide-logging 
Fixes #11466
 2015-12-06 10:23:31 +00:00
mwerezak
39ab31cbf8 Removes unused ORGAN_ATTACHABLE define 2015-12-06 04:34:33 -05:00
mwerezak
9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
mwerezak
5de9314803 Clears reference to parent when removing external organs 2015-12-06 03:57:15 -05:00
mwerezak
2312631508 Fixes #11510 
Splashing and external transfer now checks if the container is open
 2015-12-06 02:49:46 -05:00
mwerezak
d508893e3c Tweaks pointblank multipliers to play better with droplimb thresholds 2015-12-06 02:44:09 -05:00
mwerezak
29192fd8e8 Fixes #11466 2015-12-06 02:35:18 -05:00
mwerezak
a7d80a93e5 Fixes mismatching diona internal organ tags 2015-12-05 23:39:16 -05:00
mwerezak
b12e094112 Removes unreachable return in organ/external/remove(), smaller embedded items are no longer deleted. Implants changed to w_class 1 because seriously a w_class 3 implant makes no sense at all. 2015-12-05 23:38:57 -05:00
mwerezak
92b47c94de Makes organ/externa/attack_self() control flow easier to follow, handles embeded non-items 2015-12-05 19:19:39 -05:00
mwerezak
a5411f26c5 Fixes runtime when moving with missing legs or feet 2015-12-05 18:10:39 -05:00
Zuhayr
834f86241a Alters an unEquip() conditional in Give(). 2015-12-05 00:49:35 +10:30
Chinsky
939c1a3146 Merge pull request #11376 from NullSnapshot/dev-freeze 
Bunch of IPC fixes.
 2015-12-04 11:28:25 +03:00
Zuhayr
398541f4eb Amendments. 2015-12-04 18:14:40 +10:30
Zuhayr
0cf5a709d1 Refactored give(). 2015-12-04 17:58:53 +10:30
Zuhayr
7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
Zuhayr
fd59c3ad76 More tweaks to IPC fixes. 2015-12-03 22:56:19 -08:00
Zuhayr
5561964204 Tweaks to previous commits. 2015-12-03 22:56:19 -08:00
PsiOmegaDelta
cc72f82371 Backports NanoUI fixes from dev. 
Fixes #11579.
 2015-12-03 21:50:24 +01:00
Atlantis
c7e7c05a34 Fixes #11546 2015-12-02 11:14:41 +01:00
PsiOmegaDelta
89d20b9195 Updates macro/span use. 2015-12-02 09:25:00 +01:00
PsiOmegaDelta
2560c13816 Fixes hemostat surgery. 
Port of https://github.com/PolarisSS13/Polaris/pull/381.
 2015-12-02 08:56:58 +01:00
Zuhayr
c8b6986b62 Merge pull request #11551 from PsiOmegaDelta/151201-DontTazeMeBro 
Renames the rig mounted taser.
 2015-12-02 09:59:47 +10:30
Zuhayr
c2a4ee22cf Merge pull request #11316 from atlantiscze/apc-fix 
Fixes #11149
 2015-12-02 09:57:26 +10:30
PsiOmegaDelta
1a293e2d96 Renames the rig mounted taser. 
Was previously called an energy gun, which could be mildly confusing.
Port of https://github.com/PolarisSS13/Polaris/pull/127.
 2015-12-01 08:48:47 +01:00
PsiOmegaDelta
5a0d76d876 Merge pull request #11548 from Baystation12/master 
Dev-freeze
 2015-12-01 08:09:15 +01:00
Atlantis
e33ae21f75 Adjusts APC emag behavior 
- Mostly under-the-hood changes.
- Emagged APCs may now have their panel removed with screwdriver, so you can access wires
- Emagged APCs no longer rely on locked var, instead they check for emagged var as mwerezak suggested.
 2015-11-30 23:19:04 +01:00
PsiOmegaDelta
2d5677109f Build mode throws now admin logs. 
Fixes #11514.
 2015-11-29 12:14:31 +01:00
PsiOmegaDelta
9b1123cbaa Replaces misc. checks with usr.incapacitated(). 2015-11-24 14:05:04 +01:00
PsiOmegaDelta
e67ff9e903 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-24 14:02:15 +01:00
PsiOmegaDelta
0e5fc06b13 Merge pull request #11491 from Datraen/Trayfix 
Fixes Non-human, Non-synth mobs (ghosts, mice) being able to interact with trays.
 2015-11-24 10:48:17 +01:00
GinjaNinja32
b72cb1f45b Merge pull request #11504 from PsiOmegaDelta/151122-EMPSafeShuttle 
Makes shuttle control consoles sturdier.
 2015-11-23 09:28:03 +00:00
Bjorn Neergaard
0f78998377 Fix Dionea home system 
Fixes #11492
 2015-11-22 20:34:29 -06:00
PsiOmegaDelta
26f167453c Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-22 11:40:44 +01:00
PsiOmegaDelta
782f0a8bfb Makes shuttle control consoles sturdier. 
Fixes #11501.
 2015-11-22 11:37:14 +01:00