Ccomp5950
e684b69741
Fixed a runtime issue with demonsblood. Was causing runtimes because data was inheriting the bloods data var (which is a list).
...
The drink will still maintain it's reagents and data vars but when ingested and procesed the blood is ignored.
Downsides, you can't get sick from ingesting blood in a drink (which..you shouldn't anywho)
Possible future updates: since blood is an amnetic substance make the person have nausia for ingesting it if quantities are high
2013-11-23 20:21:51 -06:00
Jeremy Liberman
6bd00eb561
Emag ATMs to drop money
2013-11-23 16:59:30 -06:00
jack-fractal
ce18d47778
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.int
code/controllers/verbs.dm
2013-11-23 11:58:50 -05:00
Mloc
c5cd3562e3
Merge pull request #3961 from Ccomp5950/loyaltyimplant_fix
...
Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
2013-11-23 04:02:40 -08:00
Ccomp5950
9e4e46cf44
Removed soda items from Booze dispenser
2013-11-23 04:49:02 -06:00
Zuhayr
471c45471e
Fixes #3927
2013-11-23 21:08:52 +10:30
Zuhayr
b476a55b47
Fixes #3967
2013-11-23 20:52:39 +10:30
Ccomp5950
df7c877da7
Space Soda should now show up in the Soda Dispenser
2013-11-23 02:02:14 -06:00
Ccomp5950
3a177a95c4
And fix so Space Cola shows up too.
2013-11-23 01:50:17 -06:00
Ccomp5950
ec79e75c0f
Fixed nanoUI issues with Watermelon Juice in the Soda Dispenser
...
Added some if statements so that NanoUI for the booze/soda dispensers isn't /exactly/ like the chemdispenser, mentions glass instead of beaker, and "drinks" instead of chemical.
Also removed my debug messages
2013-11-23 01:43:34 -06:00
Ccomp5950
91c56c6e77
Fixed Booze dispensers and soda dispensers to be able to use glasses instead of beakers.
...
Typo fix: Added taquilla back in, it's ID wasn't correct in the reagent list for booze dispenser.
added watermellon juice to the soda machine.
Todo: Fix NanoUI for these to now mention beakers, and have enough space to list watermellon juice
2013-11-22 21:46:11 -06:00
Zuhayr
abd17deb5b
Fixes #3962
2013-11-23 14:02:10 +10:30
Zuhayr
7cc1c93207
Clamps pill numbers between 1 and 20.
2013-11-23 13:47:20 +10:30
Zuhayr
6e2aa2e28a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-11-23 13:21:24 +10:30
Zuhayr
f359919623
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-11-23 13:21:11 +10:30
Zuhayr
85661195bc
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-11-23 13:20:15 +10:30
jack-fractal
5df2797b86
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.int
2013-11-22 20:30:23 -05:00
jack-fractal
3eb8d1c2b9
- lots of debugging
...
- modifying how runes are called to use reflection
- adding highlander code to make sure that there can only be one mask
- adding Spread Shadows spell
- adding cult admin investigation log
- adding mask icon
2013-11-22 20:09:24 -05:00
Ccomp5950
e00c6ae21e
Bugfix: is_loyalty_implanted() now checks to make sure the implant is actually implanted and now in your hand.
...
implant adding via the traitor panel will also update it's location to be in the players head for autopsy as well as is_loyalty_implanted() reasons.
Thanks Chinsky / alex-gh for the heads up on this.
2013-11-22 12:52:25 -06:00
Zuhayr
8400c73cc1
Nuke merge.
2013-11-23 00:44:19 +10:30
Zuhayr
507d4feb66
Reverting a half-fix that was put into master instead.
2013-11-23 00:41:25 +10:30
Zuhayr
c8c8e9d078
Removing species restriction on ninja gear.
2013-11-23 00:39:00 +10:30
Zuhayr
f11b964f6c
Fixes #3921
2013-11-22 23:10:06 +10:30
Zuhayr
b2ca9f9ccb
Added icon_override var to obj/item. When worn, items with icon_override set will use this DMI instead of the hardcoded clothing DMI to determine on-mob sprite.
2013-11-22 22:51:55 +10:30
Zuhayr
ae0605db42
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-11-22 22:18:44 +10:30
Ccomp5950
9ddbc905e9
Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
...
Added a proc is_loyalty_implanted() that returns 1 if so, and 0 if not.
Added the ability to remove and add loyalty implants from the traitor panel.
Changed the checks on antags to not care if they are section heads, but to instead check for a loyalty implant.
Fixed a minor bug where traitorborgs made through traitor panel was not adding law 0
Adding a loyalty implant to an antagonist through traitor panel will also remove them from being an antag.
2013-11-22 01:12:56 -06:00
Ccomp5950
56a066ecfb
Bugfix(3937) Blindfolds cause permenent blindness
...
Removed BLIND vision flag from the object as that is already handled in mob/living/carbon/human/life.dm
Resolves #3937
2013-11-21 21:35:23 -06:00
Zuhayr
caee3a81e2
Adds sprites and skeleton definitions for species-specific Syndicate hardsuits.
2013-11-22 09:52:04 +10:30
Nanai
dd77eae405
Custom Belt Fix
...
Edited issue with chemicals spawned.
2013-11-21 17:34:12 -05:00
Jim "Apples"
f1ce28b7fe
Merge pull request #3951 from Ccomp5950/custom_item_creation
...
Custom Item Request
2013-11-21 07:23:39 -08:00
Ccomp5950
69dbec4920
Custom Item Request
...
Confirmed with Apple that this was acceptable.
2013-11-21 09:08:30 -06:00
Chinsky
65a9bf6e4b
Merge pull request #3930 from Higgin/dev
...
Changes to how projectiles work: take two!
2013-11-21 02:23:46 -08:00
Iamgoofball
43bde0598d
Uncommented the dressing up corgi code! Have fun replacing the condom! Also adds a player requested item.
...
http://baystation12.net/forums/viewtopic.php?f=33&t=9120 Rainbow Belt
2013-11-20 18:10:14 -08:00
Higgin
d72d845cba
Fix to fix a fix that needs fixing.
2013-11-20 16:00:07 -08:00
Iamgoofball
ac4e42bb2a
After a very prolonged set of Syndicate budget cuts, Detomatix PDA carts are no longer buildable
2013-11-20 15:29:33 -08:00
Iamgoofball
7dcb47ec2a
R.I.P H.O.N.KBlaster 9000. You died as you lived. Hidden in a crate.
2013-11-20 15:19:24 -08:00
Iamgoofball
b024087119
Merge branch 'smallchanges' of https://github.com/Iamgoofball/Baystation12 into smallchanges
...
Conflicts:
code/modules/research/designs.dm
2013-11-20 15:00:36 -08:00
Iamgoofball
e36f0c3fac
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into smallchanges
...
Conflicts:
code/modules/research/designs.dm
2013-11-20 14:59:33 -08:00
Iamgoofball
7fa80e799a
made head PDA carts be in lockboxes. Added Abandoned Crates!
2013-11-20 14:57:22 -08:00
Iamgoofball
ab43cc9cd6
made head PDA carts be in lockboxes. Added Abandoned Crates!
2013-11-20 14:56:49 -08:00
ZekeSulastin
2a95cdd296
Scalpels also mangle gloves for nonhuman wear.
2013-11-20 17:07:05 -05:00
Chinsky
60f644c401
Merge pull request #3941 from Iamgoofball/telesci
...
Changes Telescience to Projectile Trajectory!
2013-11-20 10:32:41 -08:00
Chinsky
4beabc587d
Merge pull request #3940 from Ccomp5950/ghost_buff
...
AntagHUD's player verbs will now disappear from the players view if disabled by admin or by configuration options.
2013-11-20 10:32:18 -08:00
Chinsky
48c35d0f8f
Merge pull request #3938 from Ccomp5950/master
...
Admin request: Jobbans for IA and ERT
2013-11-20 10:27:36 -08:00
Zuhayr
71416e543e
Changed diona evolution to use nutrition rather than nutriment.
2013-11-20 18:33:39 +10:30
Zuhayr
249cd0d069
Increased REQUIRE_LIGHT min level to 5, removed burn damage from healing from RAD_ABSORB.
2013-11-20 18:32:00 +10:30
Zuhayr
32b2009c25
Diona will take five times as much damage from plant-B-gone as previously.
2013-11-20 18:26:55 +10:30
Zuhayr
542104478f
Commented out the Sec-healing component of sprinkles.
2013-11-20 18:18:55 +10:30
Zuhayr
d1e6094a77
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-11-20 17:50:01 +10:30
Iamgoofball
2be70afe8b
changed it so that only syndi-hardsuits only restrict vox
2013-11-19 23:12:41 -08:00
