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
2de04f110d
Merge pull request #10048 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-07-08 09:10:42 +02:00
f1a790f162
Fixes duplicate var definition.
2015-07-08 09:05:55 +02:00
16abe8148a
Relocates drone law update to the new law set location.
2015-07-08 08:58:38 +02:00
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
89f93d4aac
Fixes an issue with plants.
2015-07-08 16:08:59 +09:30
97c1822be0
Merge pull request #10015 from Dragor/patch-1
...
Rewording of maintenance drone laws
2015-07-08 05:51:16 +09:30
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
27911bb7ad
Fixes num2hex
2015-07-07 18:02:59 +01:00
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
64fba0e4d5
Merge pull request #10023 from PsiOmegaDelta/150705-NoClientQdel
...
Removes a qdel(client) call.
2015-07-07 07:54:10 +03:00
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
cdb4270f48
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-06 17:31:41 +02:00
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
8f24ad03d2
Merge pull request #10019 from GinjaNinja32/provisional
...
Adds 'Provisional' to the list of acting rank prefixes
2015-07-05 22:26:15 +02:00
f134ef55a1
Merge pull request #10012 from mwerezak/guntweak
...
Shooting and machine/structure penetration tweaks
2015-07-05 22:26:05 +02:00
8305dd65a3
Merge pull request #10011 from GinjaNinja32/robot-inventory
...
Changes cyborg HUD to not display a superfluous empty row
2015-07-06 05:55:34 +09:30
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
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
0b22c65eca
Merge pull request #10006 from PsiOmegaDelta/150703-Rejuvenate
...
Rejuvenation now clears chemicals in mobs.
2015-07-05 23:08:01 +03:00
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
c5eb043a46
Merge pull request #9998 from Kearel/trayFix
...
Fixing Tray Bug
2015-07-05 20:10:26 +03:00
d32b58790d
A deleted shield generator no longer runtime every tick until force-deleted.
2015-07-05 17:33:55 +02:00
25a4fb7d9a
Adds 'Provisional' to the list of acting rank prefixes
2015-07-05 12:29:46 +01:00
1910a9a12d
Merge pull request #10016 from mwerezak/airlockfix
...
Airlock and atmos machine fixes
2015-07-05 08:43:16 +02:00
1abb52532d
Merge branch 'atmosfix' into airlockfix
2015-07-05 01:20:33 -04:00
bd59733fdb
Fixes #9714
...
Fixes incorrect arguments to calculate_transfer_moles()
2015-07-05 01:18:38 -04:00
6b550f7166
Fixes more instances of = instead of += inside loop
2015-07-05 01:02:52 -04:00
c46f32e8d7
Airlock controller fixes
...
Fixes airlocks opening their doors before the pumps have turned off.
Fixes airlocks getting confused if you mash buttons in quick succession.
2015-07-04 23:49:54 -04:00
508827580c
Formatting
2015-07-04 22:39:09 -04:00
2c61ae8e12
Rewording of maintenance drones
...
Just slight rewording of a law to make clearer that they shouldn't interact with crew at all.
2015-07-05 00:07:55 +02:00
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
fad0a712d8
Expands raider gear list
2015-07-04 15:39:31 -04:00
cf5e4a17d6
Adds raider gun type, fixes sawn shotgun inhands
...
Also adds type def to allow spawning sawn shotguns.
2015-07-04 15:39:05 -04:00
8d1e669588
Shooting while on help intent no longer auto switches to hostage mode
2015-07-04 10:47:56 -04:00
ef538f2a8c
Adjusts bullet penetration chance for default machines and structures
2015-07-04 10:46:38 -04:00
7af63ede5a
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.
2015-07-04 10:40:44 -04:00
b8e0015be1
Changes cyborg HUD to not display a superfluous empty row
...
Title. Modules with precisely 8, 16, 24 etc items were showing an extra row, this changes it from floor(X/8)+1 to just ceil(X/8).
2015-07-04 14:47:10 +01:00
6e93b7d604
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/verbs/deadsay.dm
2015-07-04 15:19:52 +02:00
b7ee6e11fc
Swaps force divisors between kitchen knives and utensil knives.
...
Because why does the utensil deal more damage than a chopping knife?
2015-07-03 22:02:28 -04:00
b2d3711c11
Fixes knife inhand states
2015-07-03 21:58:11 -04:00
9bcc061d1f
DSAY will now list that it's dsay in log instead of generic log_admin
2015-07-03 15:03:51 -04:00
fb60cfde4c
Rejuvenation now clears chemicals in mobs.
...
Fixes #9921 .
2015-07-03 16:41:10 +02:00
9a6391747d
fix trays
...
Puts pikcup proc before loc is changed.
2015-07-02 13:55:27 -05:00
88b9787ac4
Merge pull request #9991 from PsiOmegaDelta/150702-MyHandYourPocket
...
Fixes #9986 .
2015-07-02 13:55:27 +01:00
a2e66b4095
Merge pull request #9989 from PsiOmegaDelta/150702-St-St-StutteringFi-Fi-Fix
...
Speech impediment fixes.
2015-07-02 13:54:16 +01:00
2a32150658
Merge pull request #9992 from Baystation12/master
...
Master into dev-freeze
2015-07-02 19:00:00 +09:30
de39dbd1bb
Merge pull request #9973 from PsiOmegaDelta/150630-SinglePortableUnit
...
Portable turret changes.
2015-07-02 18:36:13 +09:30
db1135169d
Fixes #9986 .
...
A simple matter of a missing return line.
2015-07-02 10:43:22 +02:00
a98c4a2c8e
Speech impediment fixes.
...
Fixes #9987 .
Removes unnecessary speech problem flag check.
Removes unnecessary changeling language check. Hivemind languages are excluded from speech problems already.
2015-07-02 10:04:08 +02:00
Atlantis