PsiOmegaDelta
015fb291fa
Merge pull request #8698 from mwerezak/gun-icons
...
Fixes swapped STS-35 item states
2015-04-01 06:32:29 +02:00
PsiOmegaDelta
d430f928e8
Merge pull request #8694 from Yoshax/freejobfeedback
...
Adds feedback and logging for free job slot verb
2015-04-01 06:31:28 +02:00
mwerezak
7366df388b
Merge remote-tracking branch 'upstream/dev' into docking-update
2015-03-31 20:50:02 -04:00
mwerezak
01ce8d4a1f
Fixes #8696
...
Fixes #8696 , and updates other usages of drop_item() where appropriate.
2015-03-31 20:30:06 -04:00
mwerezak
5fe486dfe3
Fixes swapped STS-35 item states
...
Renames the states to prevent future confusion
2015-03-31 20:26:31 -04:00
Yoshax
25fa1a2258
Adds feedback and logging for free job slot.
2015-03-31 19:01:17 +01:00
Kelenius
7a3c8d2304
Makes the code compile
2015-03-31 20:02:41 +03:00
Kelenius
524ea8aeb7
Fixes a typo
2015-03-31 18:37:15 +03:00
Kelenius
502c9f1510
Fixes missed merge leftovers in syringe.dm
2015-03-31 18:34:59 +03:00
Kelenius
41ff9819bd
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/organs/organ_internal.dm
code/modules/organs/organ_objects.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/syringes.dm
2015-03-31 17:44:42 +03:00
Kelenius
4a21810b9d
Finalizes jars
...
Adds sprites (by Ryoku)
Places one in bartender's backroom, one in kitchen, two in xenobio
Adds autolathe recipe for them
2015-03-31 17:27:46 +03:00
PsiOmega
9de5b19625
Fixes event weights not being affected by having been fired before.
...
This mainly due to using a completely incorrect list, event_last_fired (used by the old system) instead of last_event_time.
2015-03-31 15:53:16 +02:00
PsiOmega
e1f8af1997
Cleans up announcement sound handling. Plays communication blackout sound at half volume.
2015-03-31 14:51:22 +02:00
PsiOmega
c4a10f05b1
Allows admins to more easily set security levels.
...
Also alters the sound for code delta.
2015-03-31 14:32:28 +02:00
PsiOmega
93ac826f02
Adds more events, misc event changes.
...
Only two more this time:
Random space dust attack.
Random gravity failure.
Moves space vines from moderate to major events, due to its now more dangerous nature.
Removes now irrelevant alien/ninja customized event handlers.
Adds Excel sheet for aiding in event probability calculations.
2015-03-31 13:07:27 +02:00
mwerezak
398459c2e7
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
mwerezak
5484a30a13
Allows gloves/shoes to be worn even if one hand or foot is missing.
...
Having a hand or foot removed still drops the worn items, so it still can be used to steal someones gloves/shoes.
The difference is that you can now pick up the dropped item and wear it again if you still have the other hand/foot left.
2015-03-31 01:40:15 -04:00
Chinsky
65f61122b5
Merge pull request #8604 from Zuhayr/limbs
...
Limb objects, severing and cybernetics
2015-03-31 08:38:54 +03:00
mwerezak
9b2f5cea33
Merge remote-tracking branch 'upstream/dev' into inventoryfix
...
Conflicts:
code/game/gamemodes/revolution/rp-revolution.dm
code/game/machinery/kitchen/juicer.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/stool_bed_chair_nest/stools.dm
code/modules/destilery/main.dm
code/modules/hydroponics/biogenerator.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/carbon/monkey/inventory.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
Zuhayr
6ac0791a0e
Merge pull request #8654 from PsiOmegaDelta/NullRefAccess
...
Fixes occasional issue with req_(one_)access being null.
2015-03-31 15:50:52 +10:30
Zuhayr
299a977701
Merge pull request #8679 from Yoshax/tempgun
...
Fixes #8672
2015-03-31 15:17:47 +10:30
mwerezak
582ebcfc59
Typo fix
2015-03-31 00:43:07 -04:00
mwerezak
9ad533a094
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/monkey/update_icons.dm
code/modules/mob/mob_helpers.dm
code/modules/spells/spellbook.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2015-03-31 00:16:56 -04: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
mwerezak
ab9886ce47
Updates comment
2015-03-30 22:29:15 -04:00
mwerezak
cdfce64ad0
Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.
2015-03-30 22:05:00 -04:00
=
2e728cfd4b
Added macros for droplimb flags.
2015-03-31 11:42:45 +10:30
=
ea25f4fb73
Adjusting burn drop prob.
2015-03-31 11:20:28 +10:30
=
601e6fb7ef
Merged with dev.
2015-03-31 11:17:13 +10:30
Yosh
286dffcda0
Fixes #8672
...
Fixes #8672 however the temperature gun is still utterly and completely
useless, but hey, at least you can fire it now.
2015-03-30 21:59:59 +01:00
PsiOmega
a9034bca66
Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork
...
Conflicts:
code/modules/mob/living/simple_animal/shade.dm
code/setup.dm
2015-03-30 22:55:24 +02:00
Chinsky
c1b3e935d6
Backwards check fixed
2015-03-30 23:28:30 +03:00
Chinsky
eb390ffde3
Fixes #8246
2015-03-30 23:20:09 +03:00
Chinsky
5429378703
Added check for second pAi for #8287
2015-03-30 22:55:17 +03:00
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
246fc62b1c
Whoops missed a bracket
2015-03-30 22:23:29 +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
1a93042226
Fixes #8548
...
Removed referenced to type of ammo used from descriptions.
2015-03-30 22:06:29 +03:00
Chinsky
40cf940f13
Fixes #8564
2015-03-30 22:04:13 +03:00
Chinsky
e3ad4dc013
Fixed #8602
2015-03-30 21:59:50 +03:00
Chinsky
dfdea36479
Fixes #8642
2015-03-30 21:36:41 +03:00
Chinsky
a8ee3ca25e
Merge pull request #8560 from PsiOmegaDelta/PCAILaws
...
PC AI laws.
2015-03-30 21:23:34 +03:00
PsiOmega
ef8b7466ac
Merge remote-tracking branch 'upstream/dev' into NarsiePort
...
Conflicts:
code/modules/projectiles/projectile/change.dm
2015-03-30 20:17:05 +02:00
Chinsky
056c00fc9a
Merge pull request #8671 from Yoshax/spellfixes
...
Updates spellbook descriptions and cooldowns
2015-03-30 21:15:08 +03:00
Kelenius
8a51470461
Adds jars
...
Can hold money or a single lizard/mouse/spiderling
2015-03-30 19:41:54 +03:00
Chinsky
5837eb2675
Merge pull request #8668 from Yoshax/dev-freeze
...
Fixes #8652
2015-03-30 19:40:13 +03:00
PsiOmegaDelta
fefb55db93
Merge pull request #8674 from GinjaNinja32/rig_guns
...
Rig weapon fixes
2015-03-30 15:02:22 +02:00
PsiOmegaDelta
6f1f18c3a7
Merge pull request #8647 from Kelenius/ofStaffsAndChange
...
Of staffs and change
2015-03-30 13:18:51 +02:00
