Commit Graph

1547 Commits

Author SHA1 Message Date
Zuhayr 98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +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
Chinsky be8e76a01e Merge pull request #8535 from Kelenius/ofCandlesAndTime
Makes candles last longer
2015-03-19 00:20:07 +03:00
Kelenius cc9f15dd67 Makes candles last longer 2015-03-18 20:57:51 +03:00
Zuhayr e600cdbd3b Fixes #8430 2015-03-17 19:18:30 +10:30
PsiOmega 7f68403ae4 NanoUI - Silicon law manager
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
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
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
Chinsky 81a9f87ad7 Merge pull request #8336 from mwerezak/liquidfire
Implements liquid fuel fires
2015-03-03 10:31:49 +03:00
mwerezak 49b3db964f Implements fuel fires
Implements liquid fuel fires using the liquid fuel cleanable decal objects.
Rewrites zburn to be more sane, replaces convoluted calculations with straightforward reaction limit.
Fixes issue with liquid fuel spreading caused by thee object being deleted.
Prevents zones from being repeatedly added to the active fire zones list, and processed repeatedly.
2015-03-02 12:40:01 -05:00
PsiOmega 02a1e1d129 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/light.dm
2015-03-01 21:15:47 +01:00
Zuhayr 64b33c43db Refactors some job variables from the Economy file (what the fuck) and swaps created types for lists in bot access assignment. 2015-02-28 20:20:19 +10:30
Zuhayr 0beb6259f6 Partial fix for #8068. 2015-02-28 17:29:26 +10:30
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 451337476d Merge with dev. 2015-02-21 20:11:35 +10:30
Zuhayr 0c206344b6 Master<dev 2015-02-21 19:57:31 +10:30
Zuhayr 2ecd76b07f Master merge. 2015-02-21 19:51:28 +10:30
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
Chinsky ae0ce4e620 Merge pull request #8170 from mwerezak/inventoryfix
Fixes #8075 + cigar/pipe overlays
2015-02-19 19:59:16 +03:00
mwerezak 01784d8d6a Fixes cigar/pipe mob overlays not updating when lit 2015-02-19 00:44:11 -05: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
Akai Alonkai c6b66a1000 Defines icon file for purple comb
Fixes #8133
2015-02-18 15:09:40 -05:00
PsiOmegaDelta 4e785f716a Merge pull request #8160 from mwerezak/stools
Replaces stool structures with stool items
2015-02-18 07:35:54 +01:00
mwerezak 57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -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
RavingManiac 2ebf834b9b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-02-15 22:37:55 +08:00
RavingManiac 50d0fd0bc6 Changed supermatter engine manual for thermoelectric engine.
Expanded supermatter engine radiator bank. Incinerator disposals outlet moved slightly to prevent collision. Supermatter radiator circulator pump changed to a high-powered pump.

Supermatter critical temperature lowered to 5000K.
2015-02-15 22:16:36 +08:00
Zuhayr 32813af228 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-15 22:04:07 +10:30
Zuhayr be2b0aa6f4 Merge pull request #8135 from Baystation12/master
Master into dev.
2015-02-15 22:03:43 +10:30
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
GinjaNinja32 dafcc2a374 Fixes runtime when walking over shards with no shoes 2015-02-14 23:29:11 +00: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
PsiOmega 4c20beac43 Adds a surgical kit for 3TC. Contains only tools, no medication. 2015-02-14 11:47:49 +01:00
mwerezak f8977c65af Much nicer syringe gun implementation
Makes syringe guns a type of launcher gun, and removes the hack
projectile.
Also moves syringe and dart gun source files into the modules/projectile
folder.
2015-02-13 23:48:35 -05:00
Zuhayr 5e87b21d44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-14 09:32:17 +10:30
PsiOmega 3fb34237ee Additional uplink items.
Adds the syndicate radio channel encryption key for 2TC.
Adds a trash bag to the Smooth operator (9mm+silencer) kit.
2015-02-13 13:22:12 +01:00