Commit Graph

1717 Commits

Author SHA1 Message Date
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
Kelenius
b4b635f32d Chemistry commit
I messed something in the git
2015-03-25 19:09:10 +03:00
Zuhayr
97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
volas
5fee41d4ba sanitize() refactor: third pass (misc) 2015-03-25 01:05:21 +03:00
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
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
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
volas
f8822626bb sanitize() refactor: second pass(other sanitize functions) 2015-03-23 01:38:09 +03:00
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
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
Zuhayr
92f53d6b80 Fixes #8478 2015-03-17 20:08:46 +10:30
Zuhayr
b766f9efcf Fixes #8378 2015-03-17 19:20:33 +10:30
GinjaNinja32
2f4a4a6a6c Remove medicine crate and medicine cartridge crates 2015-03-16 21:24:30 +00:00
GinjaNinja32
458970a617 Merge remote-tracking branch 'upstream/dev' into reagent_dispenser 2015-03-16 21:21:56 +00: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
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
GinjaNinja32
30cfa30c73 Absolute paths 2015-03-02 02:38:12 +00:00
GinjaNinja32
c3388020ff Reagent dispenser rework 2015-03-02 02:25:32 +00:00
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