Commit Graph

808 Commits

Author SHA1 Message Date
Jarcolr
4ec329f050 Fixes #8444
Now it won't hurt people's OCD and it won't bubble at round start!
2015-04-17 16:44:43 +03:00
Chinsky
d422ecd5aa Merge pull request #8791 from GinjaNinja32/virusfood
Removes duplicate virus food recipe, adjusts correct recipe
2015-04-10 12:25:08 +03:00
GinjaNinja32
4784dd8f95 Fixes dough and synthmeat recipes to correctly generate multiple products
Fixes #8786
2015-04-09 16:28:06 +01:00
GinjaNinja32
9bd93dbb29 Removes duplicate virus food recipe, adjusts correct recipe
Fixes #8590
2015-04-09 16:01:19 +01:00
Zuhayr
1070a8f63c Adds weedkiller smoke checks to hydro trays and spreading plants. 2015-04-01 07:25:09 -07:00
Zuhayr
5326abb67d Fixes #8611 2015-04-01 07:24:53 -07:00
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
GinjaNinja32
e7b4370772 Fixes #8650 2015-03-28 22:01:02 +00:00
mwerezak
1ce81b91b1 Adds bread tube trash item 2015-03-24 04:03:06 -04:00
mwerezak
113498dc1e Makes bread tube nutriment content similar to comparable snacks 2015-03-24 03:57:17 -04:00
Zuhayr
92f53d6b80 Fixes #8478 2015-03-17 20:08:46 +10:30
Zuhayr
b766f9efcf Fixes #8378 2015-03-17 19:20:33 +10:30
Zuhayr
14321003f1 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze 2015-02-28 17:04:22 +10:30
Zuhayr
7c2678c9ed Merge pull request #8317 from Baystation12/master
Master into dev-freeze
2015-02-28 17:01:42 +10:30
Zuhayr
71ecceec9e Fixes #8226 2015-02-28 16:51:37 +10:30
Zuhayr
bead2896bb Merge pull request #8296 from comma/master
Fixes #8270
2015-02-28 16:28:05 +10:30
Chinsky
3d95981394 Fixes #8270
Fixes part where alcohol potency was doubled and halves drinking glass volume so it won't hold a half of a bottle.
Also set bottle/shaker volumes to new 30u base most reagent containers like beakers/bottles use nowdays as requested.
2015-02-27 13:40:37 +03:00
GinjaNinja32
8483d7c679 Changes grid logic to be slightly less convoluted, clamp position to inside the object's icon 2015-02-26 18:46:10 +00:00
Zuhayr
391ddd970e Resolves remaining issues with xenohydro PR. 2015-02-24 17:55:39 +10:30
Zuhayr
d0ca48cd25 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-22 16:28:16 +10:30
mwerezak
5d627d4b24 Fixes compile warning, cleanup 2015-02-21 15:36:33 -05:00
emmanuelbassil
a46540ecd7 Damn you space 2015-02-21 14:53:33 +02:00
Zuhayr
14f8e3beac Numerous kitchen changes in tandem with prior commit. Removed processor. 2015-02-21 22:24:01 +10:30
Zuhayr
9ad9f19a0b Transitioning back to using flour as a reagent. Sorry RKF. 2015-02-21 22:04:32 +10:30
emmanuelbassil
feb335c172 Goddamnit. 2015-02-21 11:56:01 +02:00
emmanuelbassil
0621e6adea Adding ..() 2015-02-21 11:39:36 +02:00
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
emmanuelbassil
ec8b3fe195 Forgot the else! 2015-02-21 10:14:33 +02:00
emmanuelbassil
88dd80088c Using switch statement 2015-02-21 08:43:43 +02:00
emmanuelbassil
db702e13b6 Fixes #8174 2015-02-20 23:33:22 +02: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
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