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
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
mwerezak
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
mwerezak
e6d19faeba
Cleans up mob/inventory.dm, fixes removed_from_mob() not calling dropped() on items.
...
Updates u_equip() accordingly in the other inventory.dm files as well, and moves some random inventory procs from mob.dm to mob/inventory.dm.
2015-03-30 04:35:57 -04:00
Zuhayr
bdbb61f0f8
Merge pull request #8664 from Yoshax/MyWork
...
Changes ED-209 Construction to work with new armor vests
2015-03-30 17:52:35 +10:30
Kelenius
bb2ad4efdb
More change for the staff of change
...
Better item dropping
elseif instead of if
No more create_new_xenomorph
And a span class
Yay for named xenos
2015-03-30 10:11:41 +03:00
GinjaNinja32
e342bf8a3a
Fixes #8673 , also makes some messages clearer and removes the twin cooldowns on rig weapons
2015-03-30 03:54:18 +01:00
Yosh
c1b7ca3b89
Further description fixes
2015-03-30 01:17:57 +01:00
Yosh
e9125474dd
Spellbook spell description update
...
Updates what obvious problems in the descriptions I could see.
2015-03-30 01:12:23 +01:00
Yosh
57a8822c43
Spellbook cooldown corrections
...
Displayed cooldowns in the wizard's spellbook were partially incorrect,
fixed now to display the correct cooldowns.
2015-03-30 01:01:12 +01:00
Zuhayr
2f60c4b82d
Merge pull request #8638 from Zuhayr/vox
...
Removes the vox armalis.
2015-03-30 08:56:34 +10:30
=
d2ede0afd4
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-03-30 08:55:49 +10:30
Yosh
e4b827134e
Fixes #8652
...
Fixes #8652
Took me long enough, I'm pretty retarded, and to answer Psi's question,
yes, this fixes it.
2015-03-29 23:19:21 +01:00
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
=
6a6e09b15c
Updating the organ addition proc.
2015-03-30 08:19:30 +10:30
Yosh
42cb430f02
Changes ED-209 Construction to work with new armor vests
...
Changes ED-209 construction to accept any type of the newer armor vests
rather than the old mostly deprecated armor vests.
2015-03-29 18:05:07 +01:00
