Commit Graph

928 Commits

Author SHA1 Message Date
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
728cb3cffa Working on vines. 2015-02-18 23:37:27 +10:30
Zuhayr
ae1161184c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-18 14:17:39 +10:30
Chinsky
e596d45013 Merge pull request #8137 from mwerezak/lexorin
Lexorin cleanup
2015-02-17 11:58:34 +03:00
Zuhayr
8b9cf94e2e Readded icon for water flower. 2015-02-16 22:18:12 +10:30
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
mwerezak
d75379d6af Lexorin causes losebreath instead of oxyloss
Makes lexorin actually do what it's description says, now less deadly as
a side effect.
2015-02-15 19:12:26 -05: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
mwerezak
f54588675f Fixes soporific and chloral hydrate
Soporific now makes people fall asleep, as intended. CH now knocks
people out after 20 seconds, instead of after 3 minutes.
2015-02-14 13:51:10 -05:00
mwerezak
e5f8ac50b4 Rewrites grenade launchers 2015-02-14 13:39:11 -05: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
mwerezak
0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
mwerezak
01798c98b6 Rewrites syringe and dart guns 2015-02-13 01:34:35 -05:00
Zuhayr
8fb5836e4f Generalized fruit products properly. 2015-02-13 03:52:46 +10:30
PsiOmega
f8c5cf8f83 Adds a kit with cigarette packs and zippo lighter.
Includes 2 packs of flash powder cigarettes, 2 packs of smoke creating cigarettes, 1 pack of mindbreaker cigarettes, and 1 pack of tricordrazine cigarettes.
2015-02-12 16:35:49 +01:00
PsiOmega
73bc5934d5 Replaces uplink Donk-pockets with Sin-Pockets.
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.

Makes the concealed cane use non-del methods.
2015-02-11 09:55:50 +01:00
Zuhayr
08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +10:30
mwerezak
ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm
2015-02-10 20:59:22 -05:00
mwerezak
bf24ac82b8 Removes IsHandgun() proc, adds slot flag 2015-02-10 20:25:41 -05:00
PsiOmega
d0a59bcd03 Adds a health section in the uplink.
Box of donk-pockets for 1 TC.
Combat medical kit, containing bicardine, dermaline, dexalin plus, dylovene, tramadol, and spaceacillin, for 5 TC.
2015-02-10 21:29:29 +01:00
PsiOmegaDelta
973bc1c0f3 Merge pull request #8071 from RKF45/newpaint
Generic Paint II: Fun with Paint
2015-02-10 06:48:32 +01:00
RKF45
13f09d95c8 Juice paints 2015-02-08 01:17:10 +01:00
RKF45
db6ff13f5f No painting ghosts!
Holograms can be coloured, though
2015-02-07 23:59:34 +01:00
Ccomp5950
8f2720b179 Merge pull request #8052 from mwerezak/boolit
New bullet types, projectile refactor
2015-02-07 14:07:22 -05:00
Ccomp5950
33e2fae704 Merge pull request #7967 from Kelenius/ofSlimesAndHumans
Update for the slimes
2015-02-07 00:20:13 -05:00
Zuhayr
402987edc3 Merge with dev. 2015-02-07 14:44:55 +10:30
mwerezak
0b8940da79 Merge remote-tracking branch 'upstream/dev' into boolit 2015-02-06 20:23:05 -05:00
unknown
39b467c9da New bullet types, projectile rewrite
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
RKF45
5fc1ae395d All cleaning removes paint
Paint works on mobs and objects
2015-02-07 01:41:08 +01:00
RKF45
0ad5195af2 Cleaning up 2015-02-06 23:55:11 +01:00
Chinsky
3384f13a31 Merge pull request #8029 from GinjaNinja32/viro
Virology rework
2015-02-06 00:18:13 +03:00
Zuhayr
43d576dcc5 Merge pull request #8054 from mwerezak/chembottles
Replaces chem bottles with their overlay equivalents
2015-02-05 23:05:45 +10:30
Zuhayr
c5e2feb5f1 Merge with dev. 2015-02-05 20:24:06 +10:30
mwerezak
9caf76d069 Glass bottles are now dispensed with the lid on
It seemed kind of silly that vendors, for example, would dispense
bottles with their lids off.
2015-02-05 00:41:59 -05:00
mwerezak
8da0fb7f43 Merge remote-tracking branch 'upstream/dev' into chembottles
Conflicts:
	code/modules/hydroponics/hydro_tools.dm - flags var
2015-02-05 00:37:19 -05:00
mwerezak
59bbf3a883 Replaces chem bottles with their overlay equivalents 2015-02-05 00:31:56 -05:00
Chinsky
f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
Chinsky
82ca870c53 Merge pull request #8028 from GinjaNinja32/beaker
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
2015-02-04 18:14:22 +03:00
Zuhayr
fdf0360a69 Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP. 2015-02-04 10:55:33 +10:30
Zuhayr
09e4be2b1b Collapsed space vines, glowshrooms and biomass into one spreading-plant system. 2015-02-04 10:49:41 +10:30
Zuhayr
0e93c1cf7b Rewriting the /obj/effect/glowshroom into a more general system. 2015-02-04 10:49:09 +10:30
Zuhayr
d616040e8c Renamed some files, did some path replacements 2015-02-04 10:48:18 +10:30
Zuhayr
3ff956da69 Moved grown.dm to hydro folder for traits. 2015-02-04 10:46:24 +10:30
Zuhayr
d08861e25b Moved gas/light/pressure from hydro tray to seed datum 2015-02-04 10:46:10 +10:30
Zuhayr
983ca55c9d Autopopulates the plant and product icon lists at roundstart. Should make missing plant icons obnoxiously easy to spot due to a world output in bright red. 2015-02-04 10:43:33 +10:30
Zuhayr
e5935e01f1 Span classes. 2015-02-04 10:43:01 +10:30
Zuhayr
78e61d9ccd Tweaks to xenoflora, added plant icons and colours to all plants. 2015-02-04 10:42:39 +10:30