Commit Graph

19974 Commits

Author SHA1 Message Date
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
PsiOmega
cdb4270f48 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-06 17:31:41 +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
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
PsiOmegaDelta
f134ef55a1 Merge pull request #10012 from mwerezak/guntweak
Shooting and machine/structure penetration tweaks
2015-07-05 22:26:05 +02:00
Zuhayr
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
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
Chinsky
c5eb043a46 Merge pull request #9998 from Kearel/trayFix
Fixing Tray Bug
2015-07-05 20:10:26 +03:00
PsiOmega
d32b58790d A deleted shield generator no longer runtime every tick until force-deleted. 2015-07-05 17:33:55 +02:00
GinjaNinja32
25a4fb7d9a Adds 'Provisional' to the list of acting rank prefixes 2015-07-05 12:29:46 +01:00
PsiOmegaDelta
1910a9a12d Merge pull request #10016 from mwerezak/airlockfix
Airlock and atmos machine fixes
2015-07-05 08:43:16 +02:00
PsiOmegaDelta
a81113b877 Update time.dm
Restores proper roundstart hours.
2015-07-05 08:11:31 +02:00
mwerezak
1abb52532d Merge branch 'atmosfix' into airlockfix 2015-07-05 01:20:33 -04:00
mwerezak
bd59733fdb Fixes #9714
Fixes incorrect arguments to calculate_transfer_moles()
2015-07-05 01:18:38 -04:00
mwerezak
6b550f7166 Fixes more instances of = instead of += inside loop 2015-07-05 01:02:52 -04:00
mwerezak
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
mwerezak
508827580c Formatting 2015-07-04 22:39:09 -04:00
Dragor
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
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
mwerezak
fad0a712d8 Expands raider gear list 2015-07-04 15:39:31 -04:00
mwerezak
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
PJB3005
aa30a12125 Fixes another bug 2015-07-04 17:55:41 +02:00
mwerezak
8d1e669588 Shooting while on help intent no longer auto switches to hostage mode 2015-07-04 10:47:56 -04:00
mwerezak
ef538f2a8c Adjusts bullet penetration chance for default machines and structures 2015-07-04 10:46:38 -04:00
mwerezak
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
GinjaNinja32
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
PsiOmega
5518c60daf Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-04 15:33:48 +02:00
PsiOmega
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
mwerezak
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
mwerezak
b2d3711c11 Fixes knife inhand states 2015-07-03 21:58:11 -04:00
ccomp5950
9bcc061d1f DSAY will now list that it's dsay in log instead of generic log_admin 2015-07-03 15:03:51 -04:00
PsiOmegaDelta
fb60cfde4c Rejuvenation now clears chemicals in mobs.
Fixes #9921.
2015-07-03 16:41:10 +02:00
PsiOmega
f96ad8ca40 NTs relationship towards you now affects the pay grade. 2015-07-02 23:03:55 +02:00
PsiOmega
6986d9f615 Removes the human is_muzzled override as the particular object muzzling itself. 2015-07-02 22:03:16 +02:00
PsiOmega
dc503a7e3e Refactors mask voice changes.
Being muzzled no longer prevents hivemind speech.
Masks now define their own message and verb overrides instead of being hardcoded.
2015-07-02 21:40:33 +02:00
PsiOmegaDelta
41d86361a0 Merge pull request #9999 from Baystation12/dev-freeze
Dev.
2015-07-02 21:24:09 +02:00
Kearel
9a6391747d fix trays
Puts pikcup proc before loc is changed.
2015-07-02 13:55:27 -05:00
PsiOmegaDelta
8b731feb8b Economic strength now depends on race and job.
The amount of money a crew member can start with is now affected by race and species.
Also fixes #8546.
2015-07-02 20:14:35 +02:00
PsiOmegaDelta
48ee872691 Refactors gas analyize. 2015-07-02 15:32:21 +02:00
GinjaNinja32
88b9787ac4 Merge pull request #9991 from PsiOmegaDelta/150702-MyHandYourPocket
Fixes #9986.
2015-07-02 13:55:27 +01:00