Commit Graph

5104 Commits

Author SHA1 Message Date
Chinsky
0ff3d9af99 Merge pull request #9005 from mwerezak/master-fixes
Fixes (master)
2015-04-28 06:26:32 +03:00
mwerezak
d0615430ec Fixes #8997
Gibbing a human now causes all items on or in their person to get thrown around.
This includes implants and bullet shrapnel.
2015-04-27 14:48:55 -04:00
Zuhayr
3fc9260187 Merge pull request #8954 from GinjaNinja32/diona_speech
Fixes dionaea always using the verb "says".
2015-04-23 17:02:20 +09:30
GinjaNinja32
07cc28af8e Fixes dionaea always using the verb "says".
Not sure why, but speech_problem_flag is being set to 1 for dionaea, and only dionaea.
Fixes #8952
2015-04-23 08:03:07 +01:00
PsiOmega
4cc524265b Change of random virus targets.
The random virus event will now only infect mobs on station and which currently have a player that has been active in the last 5 minutes.
Placeholder until a more indepth discussion about what to do about the random event is concluded.
2015-04-22 12:27:28 +02:00
Chinsky
511d3764e7 Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe
Makes objects without moues opacity not appear via alt-click.
2015-04-18 16:57:01 +03:00
PsiOmega
860fb4946f Threating and actually using a signaler deadman switch now admin logged. 2015-04-18 12:18:14 +02:00
PsiOmega
1bd4f21c58 Makes objects without moues opacity not appear via alt-click.
Prevents clicking objects you should not be able to click.
2015-04-15 08:31:40 +02:00
PsiOmegaDelta
f988545ed5 Merge pull request #8827 from comma/dev-freeze
Some fixes
2015-04-13 08:17:53 +02:00
Chinsky
d39cc9686d Fixes #8687 2015-04-13 06:25:30 +03:00
Chinsky
b436925a33 Fixes #8735 2015-04-13 03:54:29 +03:00
PsiOmega
6458d91d83 Fixes AIs inside inteliCards being unable to interact with the world around it.
Apparently being inside an object affects view() in unexpected ways.
2015-04-12 14:04:00 +02:00
Zuhayr
d70ea77c2d Moved stack into heist antag creation for pariah reinclusion. 2015-04-10 02:35:04 -07:00
Zuhayr
e4a0edb309 Readds CAN_JOIN to Vox for Ikky. 2015-04-10 02:28:38 -07:00
Chinsky
5fc3a2a511 Merge pull request #8792 from GinjaNinja32/runtime
Runtime fixes
2015-04-10 12:24:35 +03:00
Kelenius
20d62c87ff Borg module fixes
Fixes #8775
Fixes #8797
2015-04-10 09:50:47 +03:00
GinjaNinja32
b35fe67be8 Fixes robot Life() runtime
Fixes #8610
2015-04-09 16:08:33 +01:00
Chinsky
14124985cc Offhand gun doesn't decrease probability of accidental shot now. 2015-04-05 05:29:04 +03:00
Chinsky
ae75e3555e Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience
Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
2015-04-05 05:23:14 +03:00
PsiOmega
4326b8c5d8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-03 09:22:23 +02:00
PsiOmega
ca70ac1efe Fixes #8582.
simple_animal/Life() did not terminate properly on death.
Caused issues with bears that would update their icons if Life() returned true (despite having called death).
2015-04-02 09:47:20 +02:00
Zuhayr
63a2fc6bff Fixes #8682 2015-04-01 07:05:58 -07:00
Kelenius
524ea8aeb7 Fixes a typo 2015-03-31 18:37:15 +03:00
Zuhayr
3472513cf9 Merge pull request #8645 from mwerezak/gun-icons
Adds Skowron's inhand icons for various guns
2015-03-31 14:12:03 +10:30
Chinsky
286e1cfc6b Merge pull request #8632 from PsiOmegaDelta/StopTheHurting
Fixes #8624.
2015-03-30 22:36:54 +03:00
Chinsky
c0b62fd94a Fixes #8488 2015-03-30 22:32:52 +03:00
Chinsky
1a94b6cc35 Fixes #8393 2015-03-30 22:26:46 +03:00
Chinsky
1e6e7b0146 Fixes #8580
Also fixed condition thing where having second pistol would lower chance of main one going off
2015-03-30 22:08:08 +03:00
Chinsky
dfdea36479 Fixes #8642 2015-03-30 21:36:41 +03:00
Zuhayr
2f60c4b82d Merge pull request #8638 from Zuhayr/vox
Removes the vox armalis.
2015-03-30 08:56:34 +10:30
PsiOmega
59638b2300 Fixes #8661.
Now ghosts the AI before it's deleted, setting the respawn timer.
2015-03-29 16:53:48 +02:00
mwerezak
ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00
PsiOmega
c93c81e77c Fixes #8624
Synthetics are no longer described as being wounded when dragged.
2015-03-28 20:28:39 +01:00
Zuhayr
59adbae59e Removes the vox armalis. 2015-03-27 16:41:32 +10:30
Zuhayr
dda3fc8f02 Merge pull request #8469 from mwerezak/robot-emp
Reduces the effect of EMP on robot power cells, some other things
2015-03-26 19:00:39 +10:30
Zuhayr
14950a7e3a Merge pull request #8584 from Kelenius/ofBorgsAndGlass
Fixed construction borg's Rglass
2015-03-23 21:34:36 +10:30
PsiOmega
1908ba59e2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 11:45:32 +01:00
Kelenius
026ec265d4 Fixed construction borg's Rglass 2015-03-23 12:11:58 +03:00
mwerezak
ceaa938b89 EMP deals burn instead of brute to silicons, and bypasses robot armour 2015-03-23 02:47:05 -04:00
mwerezak
28df26b36c Reduces the effect of EMP on robot power cells
Temporary fix to resolve #8454
2015-03-23 02:34:17 -04:00
Zuhayr
1474c6fdd1 Merge pull request #8574 from PsiOmegaDelta/AIDel
Deletes AI eye along with the AI.
2015-03-23 10:54:36 +10:30
PsiOmega
767f4dd537 Deletes AI eye along with the AI. 2015-03-22 18:51:15 +01:00
PsiOmega
f9b8c2dbc9 Fixes #8534.
Sets icontype to its proper value.
2015-03-22 16:25:24 +01:00
GinjaNinja32
04640eafb1 Fix issues with skill class procs 2015-03-20 22:47:51 +00:00
Chinsky
d3b202db4d Merge pull request #8512 from Zuhayr/dev-freeze
Fixes.
2015-03-17 14:19:59 +03:00
PsiOmega
018bd4ebdd Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-17 12:01:09 +01:00
Zuhayr
beaba0b88f Fixes #8440 2015-03-17 19:35:25 +10:30
Zuhayr
b766f9efcf Fixes #8378 2015-03-17 19:20:33 +10:30
Zuhayr
0267f156b5 Fixes #8446 2015-03-17 19:17:36 +10:30
Zuhayr
1f1fe76ec6 Fixes #8495 2015-03-17 19:16:56 +10:30