mwerezak
5a3c7dc432
Fixes human/checkarmor getting the armour...
...
...value for the wrong body part.
Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
2014-06-18 10:05:04 -04:00
Chinsky
be95e54e43
Merge branch 'master' into dev
...
Conflicts:
code/defines/obj/weapon.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/silicon/say.dm
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
mwerezak
1b33ca943d
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
Zuhayr
136ccc347b
Merge with dev.
2014-06-12 01:14:40 +09:30
Zuhayr
4ee8f56c29
Merged master to dev, manually fixed merge issues in map, may be some left.
2014-06-11 18:11:41 +09:30
Zuhayr
9e7fe6d700
Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.
2014-06-11 01:14:38 +09:30
sick-trigger
027514c6f3
Feed other text fix
...
Fixes #5199
2014-06-10 10:37:43 +10:00
Zuhayr
1e135f91af
Merge resolution with master.
2014-06-02 12:05:12 +09:30
Zuhayr
5f98ccaaf8
Added smaller spraybottle for drones.
2014-05-31 22:15:28 +09:30
Jarcolr
68326eaf95
Adds simple peanuts to hydroponics
...
Thanks to Nienhaus for the sprites.
http://baystation12.net/forums/viewtopic.php?f=44&t=9984
Will update this with more applications for peanuts soon.
2014-05-17 11:48:21 +03:00
Mloc-Hibernia
e3a8d5eb43
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Zuhayr
a68c4e9c55
Fixes #3993
2014-05-10 10:26:05 +09:30
Mloc-Argent
6a11ca32f8
Merge remote-tracking branch 'upstream/master' into dev
2014-05-05 22:22:01 +01:00
Mloc-Argent
e1ddec4a73
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
code/game/objects/items/weapons/manuals.dm
code/modules/mob/living/say.dm
code/modules/organs/organ_internal.dm
code/modules/paperwork/paper.dm
code/modules/supermatter/supermatter.dm
html/changelog.html
icons/mob/uniform.dmi
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-03 16:56:19 +01:00
Zuhayr
c526b9c29a
Lousy goddamn indentation.
2014-05-03 21:09:55 +09:30
Zuhayr
378e6865d4
Attempting to stop IPC from eating and drinking.
2014-05-03 20:25:36 +09:30
Ccomp5950
976ae06e6b
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/living/say.dm
code/modules/paperwork/paper.dm
code/modules/telesci/bscrystal.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-25 21:14:58 -05:00
Brian Cook
182be1a8d3
Added bucket lid sprite and functionality
...
Buckets can be lidded, however there is no change in the sprite when
this happens. This adds a lid and it's functional in game.
2014-04-22 01:57:01 -07:00
Ravensdale
68eda5201b
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/modules/paperwork/paper.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
Ravensdale
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
DJSnapshot
772edffad1
Merge pull request #4700 from Jarcolr/diction
...
Spaghetti isn't called spagetti anymore
2014-04-05 17:05:06 -07:00
Jarcolr
bec699bb7c
Spaghetti isn't called spagetti anymore
...
Didn't change the code/vars/recipes; just fixed the Name line to the
proper spelling.
2014-04-05 18:13:19 +03:00
Graham Lloyd
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
Ccomp5950
56ef5c165c
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/reagents/reagent_containers/food/cans.dm
2014-03-28 18:46:04 -05:00
Jim "Apples"
ae2c398b26
Merge pull request #4611 from Aryn/to-master
...
Ctrl-H "faggot" to "meatball" and one icon state change.
2014-03-20 11:22:37 +00:00
Aryn
de86280434
Ctrl-H "faggot" to "meatball" and one icon state change.
2014-03-20 05:05:23 -06:00
Jarcolr
6300e859a2
Fixes #4600
...
Will fix #4600 and the problem with drinks not knowing when they are open/closed.
Hopefully I didn't miss a string of code again,I don't think so,though.
2014-03-17 23:13:29 +02:00
Jeremy Liberman
31c79acd6e
Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays
2014-03-16 21:16:31 -05:00
Joey Haas
38d43fa971
Medbay, Xenobiology and Virology now have secure smartfridges.
2014-03-07 21:39:06 +01:00
Joey Haas
78e4f7e126
We now have secure smartfridges. More changes:
...
Changed xeno smartfridge to a secure smartfridge.
Added a chemistry/medical smartfridge for easy chemical storage.
Smartfridge usage now leaves fingerprints.
Secure smartfriges are emagable, by the way!
2014-03-07 21:32:13 +01:00
RavingManiac
b969e680b2
Ingested acid and mutagen will now react after the ten second delay.
2014-03-06 20:20:15 +08:00
RavingManiac
f022a19452
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
maps/tgstation2.dmm
2014-03-06 19:22:06 +08:00
RavingManiac
3b2d3eba05
trans_to_ingest now used for consumption of food, drink and pills instead of trans_to. This adds a ten second delay between ingestion and addition of the reagents to the body.
2014-03-05 23:41:42 +08:00
RavingManiac
727b87730b
Smartfridge variations added to chemistry, bar and virology. One of the virology windows didn't have sides, so I fixed that.
2014-03-05 00:03:57 +08:00
Furlucis
01e66b6733
Meat cutting fix
...
The other kind of knife actually exists. This one doesn't.
2014-03-03 02:26:04 -05:00
Ccomp5950
c56ec21ee3
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-02-26 09:34:38 -06:00
Mloc-Argent
f5ab084eac
Fixes admin attack logs to show up in-game as well as in the logfiles.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-02-25 20:36:46 +00:00
Segrain
9ff5776c9f
Pepperspray safety.
2014-02-03 05:10:04 +03:00
Segrain
1039fc9eaf
Spray sizes.
2014-02-03 05:08:08 +03:00
Segrain
6af8f01cab
Code cleanup.
2014-02-03 05:00:15 +03:00
RKF45
8fbcda2a0b
Reintroducing the dough-based cooking system.
2014-02-01 02:17:38 +01:00
RKF45
9d24651691
Non-ugly beaker examine
2014-01-25 12:05:16 +01:00
RKF45
0a4a7c7c08
Merge remote-tracking branch 'upstream/dev' into paintmixing
2014-01-13 22:15:33 +01:00
RKF45
ab8763378b
Paint mixing
2014-01-11 22:19:02 +01:00
Zuhayr
5cddea72f0
Colour fix for bread slices.
2014-01-11 02:50:49 +10:30
Zuhayr
212eed7e1c
Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food.
2014-01-11 02:47:12 +10:30
Zuhayr
16a28b7338
Added filling_color var to food items for use in sandwiches.
2014-01-11 02:35:10 +10:30
Zuhayr
f23bb5e1fd
Roasted diona, for ZomgPonies/Paradise.
2014-01-10 00:26:23 +10:30
Zuhayr
b28592d707
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-06 13:42:23 +10:30
