Commit Graph

452 Commits

Author SHA1 Message Date
Lexus Langg
04f19dea7f Added a Liquidfood dispenser, food, charge, and crate using a combo of mine and Kirby's sprite.
Fully tested, everything seems to work fine.
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
2012-05-30 15:27:00 -07:00
SkyMarshal
770e09ce5d Merge pull request #1191 from Mloc/varfix
Huge commit!  Standardizes var definitions in most places.
2012-05-30 11:07:27 -07:00
Albert Iordache
3e431b0ae0 Removed some ZAS messages sent to the error log 2012-05-30 20:11:18 +03:00
Mloc
66f633edc0 Fixed some quirks with var standardization, fixed compile error #1190.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-05-30 12:07:13 +01:00
Mloc
fbb67b2e42 Huge commit! Standardizes var definitions in most places.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-05-29 16:26:48 +01:00
Erthilo
b409a84f2d Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2012-05-29 15:00:11 +01:00
cib
3a74270e29 Merge github.com:Baystation12/Baystation12
Conflicts:
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm
2012-05-29 13:43:20 +02:00
Albert Iordache
604f7c417d Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master
Conflicts:
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
2012-05-29 08:50:58 +03:00
vageyenaman@gmail.com
49647d329a There's a metric assload of stuff here, mostly in preparation to my massive traitor expansion, so I'll try to be brief:
- I added in the foundations for traitor factions. See factions.dm for all the different faction datums. They don't do anything yet.

- I completely ported mob/var/mutations from a bitfield to a generic list. Mutation enumerated-identifiers are added into this list. For instance, TK = 1, COLD_RESISTANCE = 2, XRAY = 3, etc... The purpose of this was because bitwise operations could not actually be used after a certain size (because BYOND is stuck in the 16bit era).

- I've added in completely-functional nano-augmentations. Check under implantnanoaug.dm for a list of implants and implaners. As mentioned previously, they are completely functional but may be slightly OP. Among these nanoaugs are Super Strength, Psionic Radar, Electric Hands, Energy Blade/Sword Synthesizer, Rebreather, Dermal Armor, Combat Reflexes, and Regenerative Nanorobots. I won't go into detail as to what they do, but hopefully they should be self-explanitory. If not, check out their descriptions in the file previously mentioned.

- Added in a future traitor item, the Mind Batterer. Along with it a new .ogg file.

- New telecomms bus mainframe sprite, thanks to WJohnston.

- New holdable shield, sprites courtesy of Muncher (i had to mangle the side sprites because of a technical little issue. I'll change it back to the original soon). It can be retracted and expanded. Probably only going to be given to traitors.

- A couple of minor bugfixes here and there, along with some code tidying.


Hope this isn't too large a commit. I intended it to be MUCH larger, but I've decided to split up my Traitor Factions expansion into smaller commits.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3692 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-29 03:16:47 +00:00
Erthilo
9fa147c6dd TG: -Minor polishing tweak to borg hypos. The recharge time/cost and recharged
chemicals cut in half (same net amount over time, but it comes more fluidly).
Resets the recharge timer upon
switching modes so your battery charge and chemicals aren't wasted.
-Added the (src)s to the robot modules that I forgot. It all seems to work fine
without them, but just for the sake of consistency...
Revision: r3669
Author: 	 d_h2...@yahoo.com

(Also fixes for equip proc due to two ears.)
2012-05-29 00:50:14 +01:00
Erthilo
a7dd312b3e TG: - Removed support for the ONBACK and ONBELT flags.
- Replaced them with a whole range of inventory slot flags. These now govern
whether an item can or can't be placed in a certain inventory slot. See setup.dm
for information on the flags. These flags only affect humans tho, as humans are
the only beings with an inventory to talk of.
- Standardized some gun code and some other pieces of code as I came accross
them. I hate indented variable definitions!

This commit should not bring any change whatsoever to the game from a player's
perspective.
Revision: r3659
Author: 	 baloh.matevz
2012-05-28 22:58:57 +01:00
Erthilo
e106fe4c51 Adds water bottles to vending machines. 2012-05-28 20:14:19 +01:00
Aryn
ae2bf3c17d Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-05-27 12:50:23 -06:00
Aryn
f0f6f14355 Fixed up the errors related to ALL_ITEM_CONTAMINATION and hotspots, made extinguishers work again. 2012-05-27 12:49:26 -06:00
cib
0799cddb4b Cleanup of all the update_clothing() calls.
Mostly I replaced them with rebuild_appearance() or update_body_appearance() where suitable.

I also reorganized the new update_clothing() code a bit.
2012-05-27 20:43:52 +02:00
Erthilo
c7a910942c Fixes food not disappearing from hands when finished. 2012-05-27 00:01:17 +01:00
Aryn
6f00258376 I accidentally ALL THE THINGS! But yeah, ZAS is updated. 2012-05-26 02:01:26 -06:00
baloh.matevz@gmail.com
c2c7a3bcda - Variable declaration standardization. Big commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3671 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 19:26:36 +00:00
d_h2005@yahoo.com
27beab19d1 -Minor polishing tweak to borg hypos. The recharge time/cost and recharged chemicals cut in half (same net amount over time, but it comes more fluidly). Resets the recharge timer upon
switching modes so your battery charge and chemicals aren't wasted.
-Added the (src)s to the robot modules that I forgot. It all seems to work fine without them, but just for the sake of consistency...

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3669 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 17:10:26 +00:00
baloh.matevz@gmail.com
18ccabb33a - Removed support for the ONBACK and ONBELT flags.
- Replaced them with a whole range of inventory slot flags. These now govern whether an item can or can't be placed in a certain inventory slot. See setup.dm for information on the flags. These flags only affect humans tho, as humans are the only beings with an inventory to talk of.
- Standardized some gun code and some other pieces of code as I came accross them. I hate indented variable definitions!

This commit should not bring any change whatsoever to the game from a player's perspective.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3659 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 07:38:36 +00:00
Erthilo
1c8b1b7c72 Fixes pill bottle pickup by removing a rogue attackby proc. 2012-05-24 23:12:04 +01:00
CIB
b2ee78f697 Merge pull request #1155 from CIB/master
Blood fix
2012-05-24 01:45:04 -07:00
cib
636b2d573a Lack of blood_DNA will no longer lead to all blood mysteriously evaporating. 2012-05-24 10:44:04 +02:00
Erthilo
2f120fc7e4 TG: -Medical borg overhaul. Instead of a dozen random one-use pills and syringes,
they get an advanced hypospray that can switch between auto-replenishing
tricordrazine, inprovaline, and spaceacillin.
-Janitorborgs get a mop again, because without it they had no way of hitting
anything.
Revision: r3644
Author: 	 d_h2...@yahoo.com
2012-05-23 18:10:28 +01:00
Erthilo
be82872b5c TG: -Reverted default UI sprites to Erro's old-style. Retina-scalding Orange and new
Midnight UI scheme are now found in screen1_Orange.dmi and screen1_Midnight.dmi,
respectively.
-Driest Martinis will no longer be invisible.
-Braincakes are now able to be cut into slices.
Revision: r3641
Author: 	 d_h2...@yahoo.com
2012-05-23 18:02:00 +01:00
d_h2005@yahoo.com
b4135fe726 -Medical borg overhaul. Instead of a dozen random one-use pills and syringes, they get an advanced hypospray that can switch between auto-replenishing tricordrazine, inprovaline, and spaceacillin.
-Janitorborgs get a mop again, because without it they had no way of hitting anything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3644 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-23 16:41:55 +00:00
d_h2005@yahoo.com
ee64a4014e -Reverted default UI sprites to Erro's old-style. Retina-scalding Orange and new Midnight UI scheme are now found in screen1_Orange.dmi and screen1_Midnight.dmi, respectively.
-Driest Martinis will no longer be invisible.
-Braincakes are now able to be cut into slices.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3641 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-23 01:32:24 +00:00
Erthilo
3fcd1f68f7 Comments out blood regen due to runtimes. Fixed some problems with sleeping and resting and chloral (does not actually increase sleeping times!). Adds some messages for sleeping. 2012-05-23 02:14:35 +01:00
Erthilo
eb599dd33a Merge pull request #1119 from SkyMarshal/BugFixes
Bug fixes
2012-05-20 14:42:30 -07:00
SkyMarshal
58570a0f65 As many bugfixes as I could cram into here. 2012-05-20 14:23:10 -07:00
SkyMarshal
c8faf93e9f More Tajaran fixes, made blood-type damage not affect changelings, blood now regenerates. 2012-05-20 13:38:20 -07:00
Erthilo
56203680d9 Missed a list of AI verbs. Engineering jumpsuit whitespace eliminated. Half fixes holopads. You can use them, you can't move. Nutriment made less ridiculously healing. Player Mute OOC name change to be more clear. More AI camera fix. Small Tajaran examine text fix. 2012-05-20 20:09:23 +01:00
Erthilo
a2503dcd30 TG: -Recipe updates for some booze in an attempt to resolve recipe conflicts. I
think I got them all, please notify if any remain.
-Corgi Techs!
-Added animation to splashy puddles.
Revision: r3604
Author: 	 d_h2...@yahoo.com
2012-05-19 01:16:34 +01:00
d_h2005@yahoo.com
7eadbf3460 -Recipe updates for some booze in an attempt to resolve recipe conflicts. I think I got them all, please notify if any remain.
-Corgi Techs!
-Added animation to splashy puddles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3604 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-18 03:19:40 +00:00
petethegoat@gmail.com
f01afc7edd Moved sinks into watercloset.dm, removed sink.dm
Sink path has changed- /obj/machinery/sink to /obj/structure/sink
/obj/machinery/sink/kitchen2 to /obj/structure/sink/kitchen
Sinks have been slightly updated, if you're wearing gloves, your hands will stay bloody underneath. Nothing drastic.

Added Cheri's puddles.

Updated showers, they actually clean now. They're pretty powerful, so I'm going to add a way to make them lethal, to ensure the washing machines still get some use.

Updated hydroponics trays, to make them work better with soil.

And a couple of map fixes, for toilets that were facing the wrong way in the prison and on the mining asteroid.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3603 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-17 23:16:46 +00:00
Erthilo
17fe0e9ac1 TG: -Individual dorms now have a button inside that bolts/unbolts the door
-Door control buttons give the user a message if they lack the access
-Virology door controls now properly restrict access
-Large beaker cost reduced to 5000u glass
-Shooooorts! They're comfy and easy to wear!
Revision: r3602
Author: 	 ericgfw...@hotmail.com
2012-05-17 22:17:02 +01:00
ericgfwong@hotmail.com
44cf5ee86d -Individual dorms now have a button inside that bolts/unbolts the door
-Door control buttons give the user a message if they lack the access
-Virology door controls now properly restrict access
-Large beaker cost reduced to 5000u glass
-Shooooorts! They're comfy and easy to wear!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3602 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-17 20:10:22 +00:00
Erthilo
8a8006d078 Fixes and tweaks reagents to use REAGENTS_METABOLISM. So no more filling up on one sip of cola. Halves hunger rate due to our SUPER LONG ROUNDS. Also adds a deceased option for security records. Just cause! 2012-05-16 22:19:13 +01:00
Erthilo
51de17e8ad TG: Committing from the Proposed Commit forum:
Work by Neek
- Hulk Hogan moustache fix

Work by Yvarov
- Alien Unconciousness fix (Fixes  Issue 283 )
- - Also commented out alien snoring all over because aliens don't snore.
- Replacement light box fix (Fixes  Issue 398 )
- Syringe gun attack logs added (Fixes  Issue 465 )

Work by QualityVan
- Nettle and Death Nettle force based on potency.
Revision: r3593
Author: 	 johnsonmt88
2012-05-15 00:58:12 +01:00
Erthilo
496d6ce13b Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/defines/obj/supplypacks.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2012-05-15 00:51:50 +01:00
Erthilo
91595b5012 TG: -Fixed broken piping in DJ station
-Added a shower unit to virology's clean airlock
-Removed access requirement for Toxins Test Chamber, as it was before
-Courtroom witness box made easier to use
-QM now has full access to the departments he commands (mining)
-Beakers, small and large can now be made/recycled in autolathes. Large beakers
are significantly more expensive
Revision: r3592
Author: 	 ericgfw...@hotmail.com
2012-05-15 00:45:32 +01:00
SkyMarshal
b2d2bff7a2 Add the capability for the NT chatbot pAI to use the PDA's messaging function instead of the system it had been. Also, several bugfixes for runtimes. 2012-05-14 12:19:15 -07:00
johnsonmt88@gmail.com
d2736aa6ea Committing from the Proposed Commit forum:
Work by Neek
- Hulk Hogan moustache fix

Work by Yvarov
- Alien Unconciousness fix (Fixes Issue 283)
- - Also commented out alien snoring all over because aliens don't snore.
- Replacement light box fix (Fixes Issue 398)
- Syringe gun attack logs added (Fixes Issue 465)

Work by QualityVan
- Nettle and Death Nettle force based on potency.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3593 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-14 16:47:19 +00:00
ericgfwong@hotmail.com
333ad1f318 -Fixed broken piping in DJ station
-Added a shower unit to virology's clean airlock
-Removed access requirement for Toxins Test Chamber, as it was before
-Courtroom witness box made easier to use
-QM now has full access to the departments he commands (mining)
-Beakers, small and large can now be made/recycled in autolathes. Large beakers are significantly more expensive

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3592 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-14 08:30:12 +00:00
SkyMarshal
15d72e3b0e Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type. 2012-05-11 18:02:30 -07:00
johnsonmt88@gmail.com
6951ec37ed Committed for Sieve:
Reverted dismemberment
- This is the majority of the files

Reverted the gun change
- You wont shoot yourself putting your gun away
- You don't have to fire off all of your shots before hitting someone with your gun

Reverted Tarajans
- As requested

Hotfix for the Holodeck.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3574 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-11 02:21:00 +00:00
Erthilo
08191c824d Merge branch 'DetectiveWork' of https://github.com/SkyMarshal/Baystation12 into SkyMarshal-DetectiveWork
Notes:
Fucking hell. Makes the detective backend shit non-retarded. <3 Hashtables.
Map changes. Some improvements/adjustments to code to work with the map changes.

Conflicts:
	baystation12.dme
2012-05-10 16:48:01 +01:00
Erthilo
8aae642d83 TG: Some fixes for topic calls and inputs.
There's like 1001 things to fix so some of this is somewhat crude for now.

new helper proc located in procs/helpers.dm
reject_bad_text(var/text)
just feed any text in and it will either return the original text or null (if it
contains odd characters such as \ / < > or characters reserved by BYOND. It also
rejects if there are no non-whitespace characters)
Revision: r3571
Author: 	 elly1...@rocketmail.com
2012-05-10 03:02:56 +01:00
Erthilo
b503045444 TG: -Uncomments the third file required to make the removed drinks work. Ugh.
Revision: r3567
Author: 	 d_h2...@yahoo.com
2012-05-10 02:48:11 +01:00
Erthilo
6edf5fa002 TG: -New booze sprites for the drinks that were removed. Re-enabled the recipes for
the removed drinks.
-Drinking the Antifreeze booze makes you warmer. Duh.
-You now need 10 sheets of metal instead of 2 to make a gas canister, people
can't FILL ENTIRE ROOMS WITH THEM.
2012-05-10 02:41:27 +01:00