Commit Graph

12115 Commits

Author SHA1 Message Date
PsiOmegaDelta
6a8b051b21 Merge pull request #10076 from comma/dev-freeze
Fixes #9680
2015-07-09 23:41:42 +02:00
Null Snapshot
49ea79d0b3 Added missing return. 2015-07-09 14:40:30 -07:00
Chinsky
a21ce398ae Merge pull request #10074 from NullSnapshot/dev-freeze
Fix for #8391
2015-07-10 00:28:10 +03:00
Chinsky
d469b3f42d Fixes #9680 2015-07-10 00:27:16 +03:00
HarpyEagle
5011f9b806 Fixes virus infectionchance oversight
Fixes oversight in minormutate() that would cause viruses to become
extremely infectious after spreading to another person.
2015-07-09 17:26:15 -04:00
Null Snapshot
f2e27a8c89 fixes #8391 2015-07-09 13:23:13 -07:00
Chinsky
5b627cc763 Fixes #9939 2015-07-09 23:07:28 +03:00
Null Snapshot
87c8be10dd spans and grammar for topic.dm 2015-07-09 12:26:32 -07:00
Null Snapshot
909798a8ef Actual implementation of mod_can_(job_)tempban and mod_(job_)tempban_max 2015-07-09 12:11:27 -07:00
Mloc
278a4c38ec get rid of mob.see_in_dark and species.darksight
They don't work with the current lighting system and cause weird artifacts.

Signed-off-by: Mloc <colmohici@gmail.com>
2015-07-09 19:17:04 +01:00
Chinsky
c7d9ce4697 Merge pull request #10046 from mwerezak/custom-item-icons
Makes custom items use the host item's inhand sprites if none are provided, knife fixes
2015-07-09 20:52:38 +03:00
Chinsky
7d9b7e10f4 Merge pull request #10038 from PsiOmegaDelta/150707-HellUniverseOptimizations
Reduced Hell Universe Lag
2015-07-09 20:45:51 +03:00
Zuhayr
946c445b29 Fixes #9896 2015-07-10 01:14:12 +09:30
Zuhayr
07bd7ef684 Fixes #9610 2015-07-10 00:06:07 +09:30
Mloc
ffbf547923 Merge pull request #9889 from PJB3005/bay-lights
Lighting optimizations + NVG meson fix
2015-07-09 14:50:10 +01:00
Kelenius
12fdb7521a Fixes #9908 2015-07-09 11:29:49 +03:00
PsiOmegaDelta
df83203356 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/hydroponics/seed_mobs.dm
	code/modules/materials/materials.dm
2015-07-09 08:45:49 +02:00
PsiOmegaDelta
3751e1cdbf Merge pull request #10055 from Zuhayr/dev-freeze
Fixes.
2015-07-09 08:35:06 +02:00
PsiOmegaDelta
14acf43646 Merge pull request #10059 from Baystation12/master
Dev-freeze
2015-07-09 08:34:43 +02:00
Zuhayr
9d02b41ae7 Emergency workaround for the observer bug. 2015-07-09 11:01:42 +09:30
Atlantis
e37503dedb Fixes #9965
- Hardsuit injectors now only work on carbon-based mobs. This prevents injecting of AIs, Robots and other silicon-based mobs.
2015-07-08 21:44:04 +02:00
HarpyEagle
f23c2d5e00 Fixes droplimb wound not handling damage type 2015-07-08 15:17:50 -04:00
Zuhayr
e4fdf84ef7 Fixes #10054, fixes some mushroom issues. 2015-07-09 04:25:36 +09:30
Zuhayr
550ea5f127 Fixes #9740 2015-07-09 03:40:26 +09:30
Zuhayr
76571bf758 Fixes #9646 2015-07-09 03:29:24 +09:30
ccomp5950
0f764d8779 Admins will no longer see stars when viewing faxes.
If an admin wasn't human / ghosting / or a silicon mob they would see garbled text.
This uses the "force view" setting to 1 bypassing the check.

Fixes #10050
2015-07-08 10:47:22 -04:00
PsiOmegaDelta
746ac180aa Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-08 09:11:47 +02:00
PsiOmegaDelta
2de04f110d Merge pull request #10048 from PsiOmegaDelta/dev-freeze
Dev freeze
2015-07-08 09:10:42 +02:00
PsiOmegaDelta
f1a790f162 Fixes duplicate var definition. 2015-07-08 09:05:55 +02:00
PsiOmegaDelta
e18472c444 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/datums/ai_laws.dm
	code/modules/hydroponics/spreading/spreading.dm
2015-07-08 08:57:48 +02:00
Zuhayr
89f93d4aac Fixes an issue with plants. 2015-07-08 16:08:59 +09:30
mwerezak
8957412826 Custom items default to the inhands of the parent
Makes custom items use the inhand states and icons of the parent item
type if inhand states are not present in CUSTOM_ITEM_MOB.
Makes item_icons take precedence over icon_override for inhands only.
2015-07-08 01:39:02 -04:00
Zuhayr
b8623859b0 Merge pull request #10029 from mwerezak/vines
Stops sampling from being a means of fighting vines
2015-07-08 05:50:22 +09:30
PsiOmegaDelta
ed5a12c2a2 Revert "[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes" 2015-07-07 17:14:42 +02:00
PsiOmegaDelta
0a4131e9dc Reduced Hell Universe Lag
Based on https://github.com/d3athrow/vgstation13/pull/5273.
2015-07-07 12:55:39 +02:00
Chinsky
64fba0e4d5 Merge pull request #10023 from PsiOmegaDelta/150705-NoClientQdel
Removes a qdel(client) call.
2015-07-07 07:54:10 +03:00
PsiOmegaDelta
62017e7af2 Merge pull request #10008 from mwerezak/custom-item-icons
[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes
2015-07-07 06:44:10 +02:00
PsiOmega
cee5f1a057 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
Kelenius
eb64e0c5b6 Fixes a bug where mob sees visible message twice 2015-07-06 15:58:31 +03:00
GinjaNinja32
57bdcf43b6 Reworks character creation language selection 2015-07-06 10:07:35 +01:00
mwerezak
8925a5b23e Stops sampling from being a means of fighting vines
Vines can now only be sampled once mature, can only be sampled
periodically, and take less damage from sampling.
2015-07-05 20:59:23 -04:00
PsiOmegaDelta
f134ef55a1 Merge pull request #10012 from mwerezak/guntweak
Shooting and machine/structure penetration tweaks
2015-07-05 22:26:05 +02:00
Zuhayr
69168b8b29 Merge pull request #10020 from PsiOmegaDelta/170605-NullSpaceShield
qdel shield generators no longer runtime every tick until hard deleted.
2015-07-06 05:54:18 +09:30
Zuhayr
2129bf6c2e Merge pull request #10014 from mwerezak/raider-gear
Fixes issues with equipping raiders, raider gun type
2015-07-06 05:48:25 +09:30
Chinsky
0b22c65eca Merge pull request #10006 from PsiOmegaDelta/150703-Rejuvenate
Rejuvenation now clears chemicals in mobs.
2015-07-05 23:08:01 +03:00
PsiOmega
d9af4af844 Fixes #10024.
/mob/living/silicon/robot/handle_regular_hud_updates() called handle_regular_hud_updates() and then recursion kept happening.
2015-07-05 21:24:39 +02:00
PsiOmega
944b167e10 Removes a qdel(client) call.
Clients are not subtypes of datums. The garbage collector does not like this.
2015-07-05 21:01:09 +02:00
PsiOmega
d32b58790d A deleted shield generator no longer runtime every tick until force-deleted. 2015-07-05 17:33:55 +02:00
mwerezak
508827580c Formatting 2015-07-04 22:39:09 -04:00
mwerezak
c1bbc5c3a6 Fixes issues with raider equipping
Fixes raiders not being able to ever spawn with guns that cannot be equipped to the belt, despite those gun types being in the raider_guns list.
Fixes raiders spawning with guns for which they have no ammo.
Fixes taj/unathi raiders having a 2/3 chance of spawning without any shoes.
2015-07-04 16:32:35 -04:00