Commit Graph

11563 Commits

Author SHA1 Message Date
mwerezak cd2604e82d Fixes droplimb runtime 2015-07-09 22:25:18 -04:00
HarpyEagle f23c2d5e00 Fixes droplimb wound not handling damage type 2015-07-08 15:17:50 -04: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
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
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
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 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
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
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
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
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
GinjaNinja32 88b9787ac4 Merge pull request #9991 from PsiOmegaDelta/150702-MyHandYourPocket
Fixes #9986.
2015-07-02 13:55:27 +01:00
GinjaNinja32 a2e66b4095 Merge pull request #9989 from PsiOmegaDelta/150702-St-St-StutteringFi-Fi-Fix
Speech impediment fixes.
2015-07-02 13:54:16 +01:00
Zuhayr 2a32150658 Merge pull request #9992 from Baystation12/master
Master into dev-freeze
2015-07-02 19:00:00 +09:30
Zuhayr de39dbd1bb Merge pull request #9973 from PsiOmegaDelta/150630-SinglePortableUnit
Portable turret changes.
2015-07-02 18:36:13 +09:30
PsiOmegaDelta db1135169d Fixes #9986.
A simple matter of a missing return line.
2015-07-02 10:43:22 +02:00
PsiOmegaDelta 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
Chinsky 42a1ad8b81 Merge pull request #9985 from GinjaNinja32/teleport
Fixes the third teleportation effect
2015-07-02 09:13:03 +03:00
GinjaNinja32 7b1d9a54be Fixes the third teleportation effect
why isn't this a proc
2015-07-02 06:36:30 +01:00
Chinsky 0b9d9167f7 Merge pull request #9980 from mwerezak/supermatter
Fixes #9591
2015-07-02 06:07:42 +03:00
PsiOmegaDelta 977ed13e14 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
2015-07-01 22:35:00 +02:00
PsiOmegaDelta 791b9eb27d Merge pull request #9981 from Zuhayr/antioxidant
Removes the RUST engine.
2015-07-01 08:31:14 +02:00
Zuhayr 8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
mwerezak 5ec5fdeb46 Fixes #9591
Adjusts supermatter radiation range and intensity
2015-07-01 01:18:14 -04:00
PsiOmega 15c165f4e5 Fixes #7042.
Fixes issues with the AI centering on its core whenever it's attached to machinery.
Previously fixed on dev-freeze.
2015-06-30 20:09:10 +02:00
PsiOmegaDelta a76c915e2e Adds missing changelog icon to the client pre-fetch. 2015-06-30 15:13:28 +02:00
PsiOmegaDelta 001d4839f1 Fixes missing assessment check. 2015-06-30 15:03:51 +02:00
PsiOmegaDelta cf10dc38b1 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm
2015-06-30 08:24:43 +02:00
PsiOmega 7e33beab0f Fixes drone runtime.
Spawning drones no longer cause runtimes. Fixes #9909.
2015-06-28 19:02:23 +02:00
Chinsky 9cfd04f959 Merge pull request #9952 from mwerezak/camera-console-fix
Fixes #7910
2015-06-28 19:42:00 +03:00
mwerezak 4062f81f20 Fixes #7910
Partial port from vgstation.

Notable differences:
handle_regular_hud_updates() is called anytime view is reset, instead of
just from the cancel camera verb.  check_eye() now returns the vision
flags to be set on the viewer.  Moved cameraFollow to silicon. Camera
consoles now call reset_view explicitly when they want to change a mob's
view, instead of leaving it as a side effect of check_eye()
2015-06-28 11:59:19 -04:00
PsiOmegaDelta b482c5c07d Merge pull request #9958 from GinjaNinja32/botfix
(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly
2015-06-28 12:48:54 +02:00
GinjaNinja32 9a9f8e5563 (probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly 2015-06-28 11:43:53 +01:00
Zuhayr 411987c68b Merge resolution with master. 2015-06-28 06:02:52 +09:30