Commit Graph

240 Commits

Author SHA1 Message Date
Zuhayr
49930fe55d Debugging! 2015-05-12 21:30:06 +09:30
Zuhayr
4cf296a6c9 First pass on custom item cleanup/refactor. 2015-05-12 10:53:16 +09:30
PsiOmega
10edb06036 Do not copy-paste code.
Do not copy-paste code.
2015-05-07 08:43:24 +02:00
PsiOmega
9e4dacc765 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/machinery/machinery.dm
	code/game/objects/items/weapons/storage/misc.dm
	code/game/response_team.dm
	html/changelogs/HarpyEagle-NeckgrabFix.yml
2015-05-07 08:14:57 +02:00
PsiOmega
767c6a151b Fixes #9107.
The empty donut box no longer uses a non-existing item state.
2015-05-06 15:06:19 +02:00
PsiOmega
1c38be5cfd Crayons are now children of pens. 2015-05-05 08:41:24 +02:00
PsiOmega
f760d44127 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
Yoshax
aa115f5bb2 Fixes antag surgery kit 2015-04-27 16:41:47 +01:00
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
2015-04-26 14:53:01 -04:00
Chinsky
e0c00bda55 Merge pull request #8973 from mwerezak/inventory2
Inventory updates
2015-04-26 20:13:21 +03:00
Chinsky
5f30d0fa9a Merge pull request #8982 from PsiOmegaDelta/Bullets
Adds practice rounds.
2015-04-26 20:06:37 +03:00
mwerezak
4829f1d82d Adds calls to mob_can_unequip() where appropriate 2015-04-25 13:55:24 -04:00
PsiOmega
4a35631af1 Attempts to save Yosh's code. 2015-04-25 16:39:09 +02:00
PsiOmega
e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
mwerezak
3acfe5960e Renames inventory slot string key defines 2015-04-23 04:57:03 -04:00
mwerezak
1bbb19297e Implements item_state overrides for back slot, hands
Updates backpacks to use the item_state overrides where necessary, fixes #8577
2015-04-23 03:26:18 -04:00
PsiOmega
d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +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
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
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
Zuhayr
c5d42f3a4b More work on severing, improvements to yank-out-object. 2015-03-27 17:51:10 +10:30
Zuhayr
aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +10:30
Zuhayr
ba648e3e8d Updated ismonkey(), refactored kitchen spike, refactored plastic flaps. 2015-03-26 12:45:12 +10:30
Zuhayr
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
PsiOmega
7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
Zuhayr
e600cdbd3b Fixes #8430 2015-03-17 19:18:30 +10:30
Techhead0
020e1e4c60 Tweaks.
Regeneralizes sunglasses. Adds plant analyzer and megaphone. Puts EMT gear under general medical.
2015-03-14 15:52:29 -04:00
Techhead0
d4e46182af More things in belts.
I widened the selection of things you can put in various belts. Most
notably, emergency gear in medical belts and botany gear in tool belts.
2015-03-14 14:38:30 -04:00
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
mwerezak
9f55526bce Toolboxes can now hold a limited number of w_class 3 items
They can hold up to 3 w_class 3 items, or the usual 7 w_class 2 items.
2015-03-05 11:10:26 -05:00
mwerezak
9aed472531 Minor storage cleanup
Demotes folding to storage/box, makes doughnut boxes a subtype of box.
Removes a couple of istype() hacks from storage.
2015-03-05 11:08:22 -05:00
mwerezak
3bf5a5ca99 Updates storage costs
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
2015-03-05 10:40:25 -05:00
Raptor1628
d4870b80ee Assorted Fixes
Rebalances the random armory so there are always energy weapons,
projectile weapons, and ion weapons. Ammo no longer random. Fixes some
oversights with the EMT area and improves flow. Sec Guns fit in belts.
Fixes typos and a missing price in the vending machine.
2015-02-24 14:40:02 -05:00
Zuhayr
ee0d63a43d Merged with dev. 2015-02-24 17:03:39 +10:30
PsiOmega
b38d8495b3 Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather
Conflicts:
	code/game/gamemodes/game_mode.dm
	code/modules/clothing/spacesuits/rig/suits/merc.dm
2015-02-23 17:38:50 +01:00
PsiOmega
5be726753f Updates paths after the projectile update. Adds rig modules to the uplink. 2015-02-23 17:33:12 +01:00
mwerezak
115bbbe669 Nerfs merc sniper rifle and makes it uplink purchasable
Also reduces the Z8's damage a bit, just to make it more in line with
the new bullet damage ranges.
2015-02-22 20:27:06 -05:00
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
PsiOmega
0b9406a089 Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather 2015-02-21 10:17:17 +01:00
PsiOmega
18521e6983 Now possible to order a kit with a random toxin and syringe - 4TC 2015-02-20 21:13:34 +01:00
Raptor1628
2ae273e1b8 Gear again
Collection of gear and changes from the four gear polls on the forums
includes:
2 new automatic weapons, mapped in to ERT and random weapon spawns.
Laser carbine balance.
Slow emergency softsuits, no armor value other than bio and rad, 4
slowdown.
1 knife, not mapped in, available for Psi's uplink merge.
New vests: 2 types, 2 pocket no slowdown,
4 pocket with slowdown, second is available from cargo and one random
vest
spawn in armory. The first replaces all instances of the old vests. Old
vests still exist in code.
Mercenary vest with no slowdown, 4 pockets, and slightly better armor,
not on map, possibly for Nukes or Traitor Uplink
Holster rearrangement for custom loadout.
Acid dispenser, mapped into robotics and science.
New food items, added to vendors and rations crate.
New random medical spawns, added to medbay.
Cargo and loadout additions to accommodate new items.
1 beanbag loaded 5 round shotgun added to Warden's closet to compensate
for officers having .45 ltls and the HoS having an e-gun, suggested by
IRC and server.

http://baystation12.net/forums/viewtopic.php?f=5&t=12064

http://baystation12.net/forums/viewtopic.php?f=5&t=12031

http://baystation12.net/forums/viewtopic.php?f=5&t=12027

http://baystation12.net/forums/viewtopic.php?f=5&t=12007
2015-02-18 15:35:37 -05:00
Zuhayr
ae1161184c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-18 14:17:39 +10:30
Hubblenaut
5eca5d9e37 Merge remote-tracking branch 'upstream/dev' into sprites
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2015-02-16 16:16:30 +01:00
Zuhayr
9c45f000ec Merge with dev. 2015-02-16 20:34:07 +10:30
Chinsky
f9ba327c3a Merge pull request #8099 from mwerezak/gun-rewrite
Gun rewrite
2015-02-16 11:54:52 +03:00
Zuhayr
3fc9c0aec7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-15 22:03:17 +10:30
mwerezak
ad24aa8e47 Adds mercenary sniper rifle
Adds the scoped mercenary sniper rifle and ammunition defines. Does not
add syndicate uplink option.
2015-02-14 22:33:43 -05:00
mwerezak
08635587e1 Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
2015-02-14 13:38:05 -05:00
PsiOmega
fde03b2e94 Containers now properly checks types instead of string paths.
Security and medical belts could contain now no longer existing objects. These types have been removed.

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
	code/game/objects/structures/inflatable.dm
	code/modules/clothing/under/ties.dm
2015-02-14 14:16:40 +01:00