Commit Graph

6069 Commits

Author SHA1 Message Date
PsiOmegaDelta
f54dd94a66 Merge pull request #11735 from Baystation12/master
Dev-freeze
2015-12-23 11:33:35 +01:00
Atlantis
9fa1513647 Fixes AI's Examine()
- Message about AI's backup power now only show when the AI still lacks external power.
2015-12-23 00:57:54 +01:00
PsiOmegaDelta
3cf0a0e182 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-12-22 10:46:55 +01:00
ccomp5950
5873a92df8 Fixes the icon for numbness.
Resolves #11435
2015-12-21 15:30:26 -05:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
PsiOmegaDelta
378f62b81e AI qdel() improvements.
AI destruction now cleans up more of its held objects and variables.
Fixes some issues with the AI powersupply qdel().
Fixes #11710.
2015-12-19 11:45:24 +01:00
Hubblenaut
56d8975a19 Tweaks Filtering and Toxic Gases 2015-12-17 17:50:30 +01:00
PsiOmegaDelta
f62f24e1ac Removes Stat() sleep.
Fixes a Stat() runtime that occasionally occur if the client was logged out when the sleep() was done sleeping.
Fixes delays when using alt+Turf click.

Makes the alt+Turf click panel only update when viewed instead. Seems like the better performance fix option in general.
Makes the alt+Turf click panel always use the "Turf" name, consistency.
2015-12-16 13:24:40 +01:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
2015-12-13 10:15:29 +01:00
Chinsky
911498fc32 Merge pull request #11679 from Baystation12/GinjaNinja32-patch-1
fix slime core injecting not working
2015-12-13 11:05:16 +03:00
Joseph Heinemeyer
a5b0f86c19 s/"help"/I_HELP/g 2015-12-12 15:24:13 -07:00
GinjaNinja32
ddf66a5f39 fix slime core injecting not working 2015-12-12 21:56:37 +00:00
PsiOmegaDelta
fd14a90c34 Merge pull request #11673 from comma/dev-freeze
Impulse directions and zombie vomit
2015-12-12 16:38:36 +01:00
Chinsky
637abb5d12 Fixes #10597 2015-12-12 15:29:10 +03:00
PsiOmegaDelta
a731571d60 Merge pull request #11670 from comma/norandom
Fixes #9197
2015-12-12 12:45:13 +01:00
Chinsky
e89eae05bb Fixes #9197 2015-12-12 14:23:00 +03:00
Chinsky
1927d1744f Fixes #11667 2015-12-12 13:57:26 +03:00
SkyMarshal
a97da84b18 Fixes #11093
Also fixes a runtime error trying to disposal monkeys and the like.  It was doing a type check too late.
2015-12-11 21:32:00 -07:00
Atlantis
ac0e70612f Fixes #11621
- Fixes #11621 by ensuring reference to analyzed object is nulled even if the analyzed object is not reliable enough
- Adds feedback message that warns the user that analyzed item wasn't reliable enough.
2015-12-11 12:15:53 +01:00
Zuhayr
e9cdc8a0f5 Fixes #9257 2015-12-10 11:57:34 +10:30
Zuhayr
f1630108db Fixes #10915 2015-12-10 10:32:35 +10:30
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
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
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
a7d80a93e5 Fixes mismatching diona internal organ tags 2015-12-05 23:39:16 -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
5561964204 Tweaks to previous commits. 2015-12-03 22:56:19 -08:00
PsiOmegaDelta
c826d3d237 Fixes being unable to eat.
Silly 1-based indexing.
2015-11-20 11:21:39 +01:00
Chinsky
f247ea1df6 Merge pull request #11379 from mwerezak/ipctemp
Fixes #11354
2015-11-12 02:02:45 +03:00
mwerezak
7e472af238 Fixes temperature HUD being incorrect for species with null body_temperature. 2015-11-10 23:53:18 -05:00
mwerezak
52deec9fde Adds thermal radiation into space for human mobs
Main effect is that IPCs won't gain temperature infinitely anymore.
2015-11-10 23:52:41 -05:00
PsiOmegaDelta
2968952913 Merge pull request #11438 from Baystation12/master
Dev-freeze
2015-11-10 10:34:40 +01:00
PsiOmegaDelta
5c587e69b6 Exploit fix.
Players can no longer immediately respawn as mice by ghosting.
2015-11-07 17:12:50 +01:00
PsiOmegaDelta
e81f42840a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/species/station/station.dm
2015-11-06 17:43:05 +01:00
PsiOmegaDelta
73f99a4c01 Secondary diona nymphs now get non-restricted/whitelisted languages on split. 2015-11-05 10:04:00 +01:00
PsiOmegaDelta
5f4af85af9 Refactors diona split code for maximum reuse. 2015-11-05 08:15:10 +01:00
PsiOmegaDelta
daa9b0e0bc When a diona splits, the main nymph inherits all known languages.
Fixes #11401.
2015-11-04 17:50:51 +01:00
PsiOmegaDelta
1fa73c0c18 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-11-03 17:37:46 +01:00
HarpyEagle
f49b6d7cd1 Fixes #11405 2015-11-02 23:35:25 -05:00
PsiOmegaDelta
694a35c10b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-02 09:08:06 +01:00
PsiOmegaDelta
392fd6210d Merge pull request #11388 from PsiOmegaDelta/151028-LiveDroneLIVE
Allows drones to recharge their synth materials.
2015-11-01 18:43:43 +01:00