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
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
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
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
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
9a7515af8f
Merge with dev-freeze.
2015-07-02 19:04:01 +09:30
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
b5a47fd43b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/silicon/ai/life.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/power/rust/core_gen.dm
code/modules/power/rust/fuel_compressor_construction.dm
code/modules/power/rust/fuel_injector.dm
2015-07-01 22:46:40 +02: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
PJB3005
dcbfff8aaa
Fixes stuck lights
2015-07-01 07:59:19 +02:00
mwerezak
5ec5fdeb46
Fixes #9591
...
Adjusts supermatter radiation range and intensity
2015-07-01 01:18:14 -04:00
Chinsky
0e6aea6842
Merge pull request #9957 from mwerezak/hats
...
Updates hats to use item_state_slots where necessary
2015-07-01 06:56:21 +03: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
cc1ca0e616
Compilation fixes.
2015-06-30 09:01:51 +02:00
PsiOmegaDelta
f420dd9f01
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defines.dm
code/modules/mob/living/silicon/silicon.dm
code/setup.dm
2015-06-30 08:59:34 +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
Zuhayr
b0a5705fa8
Makes suits usable with the icon state system.
2015-06-30 12:15:06 +09:30
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
Zuhayr
4a2d7b661e
Merge pull request #9812 from PsiOmegaDelta/150614-MakingYourLifeEvenEasierApplyDirectlyToForehead
...
Refactors Life() - Part II
2015-06-28 20:20:49 +09:30
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
mwerezak
263f721f3e
Updates more hats
...
Also moves hat inhands to separate dmi.
2015-06-28 01:50:05 -04:00
mwerezak
309dff6aba
One less object verb
2015-06-27 23:54:20 -04:00
mwerezak
c7ff5eebe3
Updates hats to use item_state_slots where necessary.
2015-06-27 23:33:33 -04:00
Zuhayr
f096d5cabe
Merge resolution.
2015-06-28 06:13:24 +09:30
Zuhayr
411987c68b
Merge resolution with master.
2015-06-28 06:02:52 +09:30
