Commit Graph

655 Commits

Author SHA1 Message Date
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Unknown
62c7ba1f80 Merge remote-tracking branch 'upstream/master' into Memes 2018-08-29 19:23:06 +02:00
Superhats
747cf2044b Hyposprays ! 2018-08-26 14:53:51 +02:00
Gwydion Brain
f1bdbaf375 medicalhypo initial 2a 2018-08-07 03:49:49 -07:00
Gwydion Brain
442b7320b8 medicalhypo initial 1A
+medivend_hypo icon state
=changes medical hypospray to use said sprite
=changes medical hypospray description to hopefully confuse security and traitors less.
2018-08-06 22:19:08 -07:00
Fox McCloud
3193d599cb Medical Hypospray 2018-08-02 23:39:15 -04:00
Kyep
412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
2018-06-13 16:55:21 -07:00
Ansari
0b0b1b7478 Make it so that spray displays coordinate of user (Instead of the spray which is always 0,0,0) 2018-06-07 22:33:27 +08:00
Fox McCloud
7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk
# Conflicts:
#	code/game/objects/structures/window.dm
2018-06-03 18:49:44 -04:00
Fox McCloud
7c55ffb841 this was bad 2018-05-19 23:56:34 -04:00
Ansari
dca636b3e5 Add coordinates to acid / lube spray message for administrative purpose 2018-05-19 11:11:43 +08:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000
c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
tigercat2000
5a756ad3c9 Merge pull request #8708 from Birdtalon/nanocalcium
Nanocalcium: Bone repair drug.
2018-03-19 13:37:20 -07:00
tigercat2000
693e188362 Merge pull request #8583 from FalseIncarnate/coffee
Coffee Mugs and Vendor Change
2018-03-03 10:32:54 -08:00
Birdtalon
7283431211 descriptions updated by request 2018-02-27 15:13:41 +00:00
Birdtalon
904131be1e some more toys for psyche 2018-02-23 13:48:08 +00:00
Birdtalon
aa31461979 adds sound effect, reformats guide 2018-02-22 19:14:56 +00:00
Birdtalon
908d2ae53a addresses reviews - remove redundancies, changes some spans 2018-02-22 10:54:29 +00:00
Birdtalon
fe914dc5f5 finishes effects, adds nanocalcium auto-injector, adds bone repair kit to uplink. adds sprites. 2018-02-21 20:44:03 +00:00
FalseIncarnate
23c883bd57 Coffee Mugs and Vendor Change
Adds coffee mugs
- Available from hot drink vendors or loadout menu (1 point)

Adds novelty coffee mugs
- Available as a premium item from the hot drinks vendors or from the
loadout menu (2 points)

Adds support for an "item slot" in vendors, which allows an item to be
inserted into a vendor.

Adds the ability to add containers into the hot drinks machine.
- Will attempt to fill the inserted container with purchased beverages.
- Excess will still dispense in a new cup, as if there was not a
container present.

🆑
rscadd: Adds coffee and novelty mugs to the hot drinks machine and
loadout menu.
rscadd: Adds the ability to insert containers into the hot drink
machine, filling the container with your purchase.
/🆑
2018-01-22 22:46:03 -05:00
FreeStylaLT
ebb44a45d2 adds a toxic pill sprite, makes the toxin and cyanide pills use it 2017-12-27 20:42:55 +02:00
Kyep
b519615e18 Removes peacekeepers 2017-10-20 10:23:07 -07:00
Fox McCloud
cb70e28e65 Merge pull request #8146 from Landerlow/Lesspain
Adds hydrocodone to medical borg hypospray
2017-09-30 03:52:33 -04:00
Landerlow
addbe41a5d Switch back from morphine to hydrocodone on maintainer recommendation 2017-09-30 01:08:32 +02:00
Landerlow
7abe2a968d Changed reagent from hydrocodone to morphine 2017-09-29 12:10:36 +02:00
Landerlow
c4243bb597 Adds hydrocodone to medical borg hypospray 2017-09-27 00:27:27 +02:00
Fox-McCloud
e1200d6a1e Merge remote-tracking branch 'upstream/master' into peacekeeper-borgs 2017-08-16 22:08:07 -04:00
FlattestGuitar
6499f31df4 Merge me a river 🎶 2017-07-12 21:13:20 +02:00
Aurorablade
476cdc3e06 Blood Refactor (#6220)
* commit for branch swap

* branch swap again

* BLEED

* trying to clear up compile errors

* i killed everything when i tested this...

* restorealltheblood

* I REMOVED A THING

* well some progress

* stop bleeding

* got to swap branches again.

* grr

* damn bloodcolors

* Squash everything

* color....colourrrrrrr

* color....colourrrrrrr

* well now that updated the branch...

* Changes

* Some tweaks..before i upload something major

* COLOR NOT COLOUR...COLOR

YES I KNOW NOT EVERYONE SPELLS IT LIKE THAT BUT MY GOD

* Foot print shit..

blood coloring is going to be PAIN

* trying to handle some colors..maybe.

* blood colorsing sucks..di i mention this?

* commenting cod malfunctions.

* Changes

* lets try this

* Its too late at night.

* blargh

* woops

* almost works...

* progress..

* Branch swap

* figured out the overlay issue....

* BRANCH SWAP

* BLARGH

* fixed merged conflicts..expect something to be horribly wrong.

* bunch of changes

* Major Fixes

 - Moved blood_state and bloodiness var definitions to
 /obj/effect/decal/cleanable/blood as well as /cleanable/Crossed(), in
 order to make blood color work properly.
   - These were not used by any other decal, so it was pointless.
 - Tweaked human/add_blood so that hand_blood_color uses the correct
 value now.
 - Corrected gibs having the wrong basecolor.
 - Tracks of different blood colors will no longer combine weirdly, and
 will instead form seperate overlays.
   - This also fixes all of the issues with tracks in general and not
   updating correctly.
 - Fixed transfering blood in add_fingerprint; the old detective code
 didn't use the new format for add_blood().
 - Fixed xenomorphs causing runtimes in makeTrail(), and gave them their
 own trails. Sprites should probably be brightened later.
 - Fixed mobs occasionally randomly having their blood_DNA list reset.

* may have accidently removed shit.

* Mrowl

* stiff

water is not bleeding
lowered trail making threshold

* tweaks then conflcits

* weee

* indent

* some tweaks

* somefox tweaks.

* derp

* why won't they bleed!?

* BLEED DAMMIT

* Flattist comments and removes simple animale blood volume

Cause i cannot get it to work right.

* PRAISE FLATTIST

* Simple animals have a blood volume now

Bug with trail fixed.

* changes

* thanksmrowlmrowl

* exotice blood trails

* makesure is an exotic bleeder has a bleed rate first...

* FoxBoxTweakSox

* BoxVoxSoXFox

* ONE MORE THING

* animalsbleedreds

* Buh? BUGH!

* thisismescreaming

* removing note needed thing

* Color changes but the rabbit hole continues.

* This is not pretty....

* wot

* IT WORKS DAMMIT

* colors.

* germaphobic commit..

* we have to use the old system

* nothing to see here

* doubleprocarady

* try to fix mulebots

* mulebot fixed

* DONE
2017-07-11 16:49:11 -04:00
Fox-McCloud
b664f73a68 chemical bombs 2017-06-29 20:02:27 -04:00
FlattestGuitar
086327ef65 Can't taste pills and patches 2017-06-14 18:39:08 +02:00
Fox-McCloud
bca44eb0ee Adds Peacekeeper Borgs 2017-06-03 17:01:42 -04:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Fox McCloud
877b5d8457 Droppers Refactor (#7269)
* Droppers Refactor

* tweaks
2017-05-11 18:53:16 -07:00
Crazy Lemon
893fd2178e Merge pull request #6896 from pinatacolada/greasyhandsforrealsies
Dirty surgery rooms more prone to infections and ghetto surgery internal organ disinfection and dead limb revival
2017-04-26 18:51:10 -07:00
pinatacolada
bca1f4b852 fixessssss 2017-03-27 01:18:10 +01:00
pinatacolada
64dd2fd656 plis 2017-03-24 10:45:14 +00:00
pinatacolada
eafa00f4b7 Dirty surgery rooms more prone to infections and ghetto surgery internal organ disinfection and dead limb revival
Combination of #6743 and #6479, because I am a pro mlg git user, who
would never have issues with the master branch no sir

Doing surgery with another person watching, even if they don't wear a
mask, doesn't warrant an infection either, but beyond that you are
pushing your luck

However, doing surgery in this scenario:

![why would you even do this](http://puu.sh/u7kLj/f3a444e1e9.jpg)
Resulted in acute infections to the heart and lungs.

So, recap:
-Wash your hands, wash your tools if needed, clean your room, wear a
mask and nothing bad happens.
You can even invite a friend to watch over
-Do brain surgery in a blood filled room with 11 clowns honking and
breathing cooties down your patient, and it's just bad
//-Letting your patient go without closing the incisions is also bad why
would you even do that (NOT WORKING ATM)
Allows to use a droppers, bottle, drinking glasses, drinking bottles.
beakers, sprays, or if you are brave
enough, an entire bucket, to treat internal organ infections with
alcohol. The more alcoholic the thing is the more it disinfects. This is
an available option during organ manipulation, at the time where you can
apply trauma kits and etc, so you can for instance apply a trauma kit
and then drip a bottle of vodka over someone's liver to treat infection.

Also adds a debridement surgery to revive dead EXTERNAL organs. Same
list of utensils as the previous, lets you apply mithocolide on a dead
limb or chest to make it unded. Surgery steps are incision, scalpel,
applying a reagent container, cauterize.

🆑 pinatacolada
add: dirty surgery environments get you nasty infections
add: ghetto surgery internal organ disinfection with alcohol
add: dead limb revival surgery step
/🆑
2017-03-23 15:10:28 +00:00
Mark van Alphen
06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
uraniummeltdown
dd12fbe13a new flags_cover var for clothes, adjust existing flags 2017-03-10 11:33:42 +04:00
Mark van Alphen
b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Twinmold
c7eda9d78d BloodPack Tagging/Pen Labeling
With this, you can now use a pen on a bloodpack and add a label to it,
giving the ability to tag a bloodpack with the type of blood from
donations. Bloodpacks will now switch between "empty" and notso in
naming, depending on if there is reagent/blood inside or not.

:cl:Twinmold
Add: Ability to label bloodpacks with a pen, so you can now label a
bloodpack from donations without a handlabeler.
Add: Bloodpacks will now change name to say if they are empty or not.
/🆑
2017-02-18 13:11:51 -06:00
Fox-McCloud
846ce475b2 Refactors Reagent Tanks--Adds High Capacity Water Tank 2017-02-05 13:58:24 -05:00
Fox-McCloud
b62cffadf8 glyphosate plantbgone change 2017-01-28 08:36:08 -05:00
Fox-McCloud
51bbe8c466 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 06:53:18 -05:00
Crazy Lemon
0e42e416b6 Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08:00