Commit Graph

2134 Commits

Author SHA1 Message Date
TehZombehz 266159cc09 Adds Sticks of Butter, Mayonnaise, and Mix function to grinder (#27098) 2017-05-10 17:47:46 -03:00
FantasticFwoosh ef48e1c251 Plastic sheet production - Chemistry recipe (#26940) 2017-05-07 20:22:02 -03:00
QualityVan ea5426b09d Refactors blood regeneration from nutriment (#26998) 2017-05-07 20:04:57 -03:00
Leo f1a3f8a0b1 Merge pull request #26970 from cy294/bananahonkfix
Fixes an inconsistency with the Banana Honk drink
2017-05-07 10:53:24 -03:00
Leo 3edfa98541 Merge pull request #26927 from LanCartwright/salvenerf
Replaces stun/weaken from Miner's salve
2017-05-06 12:47:13 -03:00
cy294 c59a9d503e Fixes an inconsistency regarding the Banana Honk drink and its reagent name. #26690 2017-05-05 22:28:31 -07:00
Cyberboss 647750186b Holy water will now properly make you jittery (#26867) 2017-05-05 20:32:48 -03:00
Jack Edge 5a9926701c Plasma 2017-05-05 19:19:00 +01:00
Jack Edge 0c72dc1ab9 Make adamantine with adamantine slime cores 2017-05-05 18:08:40 +01:00
Jack Edge be7b49422e Adamantine golem leadership
🆑 coiax
add: Adamantine golems have special vocal cords that allow them to send
one-way messages to all golems, due to fragments of resonating
adamantine in their heads. Both of these are organs, and can be removed
and put in other species.
add: You can use adamantine vocal cords by prefixing your message with
":x".
del: Xenobiology is no longer capable of making golem runes with plasma.
Instead, inject iron into the adamantine slime core to get an incomplete
golem shell, then complete it with 10 sheets of a suitable material.
/🆑

Adamantine Golems are the starting Free Golem spawns, and they are
previously just as ordinary as Iron Golems, which are strictly worse
than a variety of other golem materials. This gives them limited one way
telepathy, to act as leaders and communicate to the other golems.

They're vocal cords because it's a suitable fit for the vocal cord code,
and recieving it is organ based because more organs are always fun.

Making "leadership" slave golems is somewhat of a contradiction, and
they're also somewhat easy to spam. This requires xenobio to at least
have some spare materials lying around (remember, you can use metal and
glass or plasteel).
2017-05-05 18:08:40 +01:00
Akke c160fc93af removes stun/weaken from miner's salve 2017-05-05 05:09:09 +01:00
Mike Long 37be45d211 Adds spewium toxin in traitor kits (#26848) 2017-05-04 19:53:06 -03:00
Jack Edge 952d726ef9 Fixes runtime with null nutriment taste data 2017-05-03 15:21:27 +01:00
Cyberboss 039b8a7834 I TOLD YOU THIS WAS WRONG #25467 2017-05-02 15:59:16 -04:00
Leo 3b9b4e0755 Changes a bunch of hrefs to the proper defines (#26760) 2017-05-02 01:19:51 -06:00
QualityVan 02c9cb5df0 Saline-glucose changes (#26556)
* Refactors saline glucose solution to work as temporary blood instead of increasing blood regeneration.

* Prevents salglu from replacing all of your blood

* Added terrible deadly overdose effects

* consumption rate is probably fine as is, really
2017-05-01 11:54:44 -06:00
swindly db7b290351 changes mercury and lithium (#26731) 2017-05-01 09:34:42 -04:00
bawhoppen 94d63eba9b Readds deepstorage w/ tweaks AND adds water bottles to vending machines (#26709) 2017-04-30 21:00:24 -03:00
oranges 7cfef759af Merge pull request #26527 from QualityVan/mutanthands
Zombie/limb refactors/fixes
2017-04-29 14:03:53 +12:00
Leo 7375d97833 Merge pull request #26557 from QualityVan/ivgrammar
Minor IV/bloodbag grammar fixes
2017-04-27 11:20:58 -03:00
QualityVan 6ef65f5d2b Adds crayon grinding (#26605)
* Enables crayon grinding

* Adds color to red crayon powder and powder to black and white crayons.

* Lets you color stuff with crayon powder
2017-04-27 11:16:43 -03:00
oranges d95e859e5d Merge pull request #26386 from ChangelingRain/initialnew
New() goes in the trash, we've gotta Initialize()
2017-04-27 10:15:10 +12:00
Cyberboss 729010bbb2 Unorphans the blackbox (#26129)
Moved sql_poll_population from server_maint to this new SS. Moved few remaining server_maint tasks to SSping and deleted it.
2017-04-27 10:04:57 +12:00
ma44 28ff6252cb Removes a unused chem (#26559)
* Update medicine_reagents.dm

* Update watertank.dm
2017-04-26 09:59:30 -05:00
QualityVan 0c8cd780b7 Minor IV/bloodbag grammar fixes 2017-04-25 08:39:22 -04:00
Joan Lung 228df13447 Merge branch 'master' of https://github.com/tgstation/tgstation into initialnew
Conflicts:
	code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
	code/modules/station_goals/bsa.dm
	code/modules/vehicles/atv.dm
2017-04-25 07:32:06 -04:00
MrPerson ff3f84ab81 Replaces /image with /mutable_appearance, where appropriate (#26518)
In cases where you're creating an image to use as an overlay, it makes more sense to use a mutable_appearance if you can. The image will create a static appearance for not just the image but also each intermediate step if you change vars along the way. The mutable appearance avoids this unnecessary and expensive process. The only situation that requires an image instead of a mutable_appearance is if the overlay is supposed to be directional. MA's ignore direction while images don't. I dunno why, probably another BYOND-ism.

I added a convenience function, mutable_appearance(), designed to emulate image(). Also went ahead and set the default plane of /mutable_appearance to FLOAT_PLANE because it's fucking 0 by default.

Several overlays that were image() calls were changed to just text strings when I could. overlays += "string" has the same result as overlays += image(icon, "string") and saves a proc call.
2017-04-25 12:15:16 +02:00
QualityVan 6590860250 Refactors zombie organs
Fixes mounted chainsaws leaving a limb if acided
Adds species support for mutanthands, basically hard-equipped items like zombie claws
Fixes zombies not having claws on new arms
Mobs manually set to zombie species revert to human when their infection is removed
Inserts organs back into the mob when a bodypart is reattached
No longer generates eyes or ears when a mob changes species without having a head

Todo:
fix the initial problem of zombies being able to not have claws due to having a nodrop item before zombification and losing it
2017-04-24 15:32:00 -04:00
Joan Lung 59b905f5ef reeeeeeeeeeee 2017-04-22 10:01:50 -04:00
coiax f993f9ce36 Refactors ear damage into ear organs (#26044)
* Refactors ear damage into ear organs

🆑 coiax
add: Centcom would like to inform all employees that they have ears.
add: Adds "ear" organs to all carbons. These organs store ear damage and
deafness. A carbon without any ears is deaf. Genetic
deafness functions as before.
/🆑

- `ear_damage` and `ear_deaf` vars removed from /mob.
- All mobs have a `can_hear` proc, which returns TRUE always except for
carbons.
- Carbons need to have an ear organ that has 0 `deaf` var.

- Explanation of how ear damage works is in the code, it hasn't been
changed from previously. Deafness is applied in number of Life ticks
until you regain hearing, while damage is long team, heals slower, and
when high enough, can cause flashbangs to make you go permamently deaf,
as before.

- Wearing earmuffs halves the healing time of deafness, and promotes
healing long term ear damage, as before. Earmuffs now have a secondary
flag HEALS_EARS, which currently only they own.

* Changes how soundbang deafness works slightly

* Ear organ icon

* Code review I

* Makes fully healing carbons not dependent on having a dna and species

* Gives monkeys and aliens ears

* Whoops

* Split organs into seperate files

* Tweaks.

* Un-removes brain damage lines

* Moved procs onto /mob for ear stuff

* Massages things into compiling

* Replacement of spam_flag with world.time tracker
2017-04-22 08:51:03 -04:00
XDTM 7cb4419709 Fixes gold and light pink slime extracts 2017-04-20 23:12:15 +02:00
Joan Lung 52cb6f9c06 some failures are just overchanging stuff 2017-04-19 18:43:14 -04:00
Joan Lung db9d86a39e New() goes in the trash, we've gotta Initialize() 2017-04-19 18:22:26 -04:00
XDTM 8b054f30af Prevents mutation toxin from working on nonhumans, removes a spawn 2017-04-17 18:34:55 +02:00
Joan Lung fa2a5bf021 Fixes a bug (#26232)
* Fixes #26223

* compress
2017-04-16 14:51:22 -06:00
Joan Lung 44b85bf82c Some more logging (#26139)
* Some more logging
And then you'll be a lumberjane!

* space

* beware the...

* hmph
2017-04-13 16:20:57 -06:00
Davidj361 dfef186597 Fix for bug #25899 (spray guns) (#26102)
* Fix for bug #25899 (spray guns)
- Made it so chemsprayers and extinguishers don't spray when you click your inventory items
- Spray guns now actually have their range change when changing modes between spray and stream

* Fix for bug #25899 (spray guns)
- Made it so chemsprayers and extinguishers don't spray when you click your inventory items
- Spray guns now actually have their range change when changing modes between spray and stream

* Changes suggested by duncathan
2017-04-12 19:53:51 -06:00
coiax de35ec5f67 Partial sparks boilerplate reduction (#26081)
* Partial sparks boilerplate reduction

- Lots of obects are making `/datum/effect_system/spark_spread`, setting
them up, firing them, and then not qdeling them afterwards.
- Makes a `do_sparks` global proc that takes the same arguments as `set_up`
and then calls `start` and then `qdel`
- Switches a bunch of things to use this proc
- Makes emitters keep their own spark_spread datum around, since they
spark so damn much.
- Also makes some things use timers and ports some things to Initialize.

* Compilation
2017-04-12 19:59:45 +02:00
coiax 5c6d0a96b1 Fixes cigarette branding and taste (#26030)
* Fixes cigarette branding and taste

🆑 coiax
fix: Cigarette branding has been fixed.
add: Uplift Smooth brand cigarettes now taste minty as advertised.
del: You can no longer inject cigarette packets to inject all cigarettes
simultaneously.
/🆑

- Makes subtypes of all the brands of cigarettes, and sets them to the
packets, removes the brand var and the special casing initializing that
had to be done for it.
- Adds "menthol", a do nothing drug chemical that tastes of mint to
Uplift Smooth (because they say they taste of mint, so we're fixing bugs
in the user's experience)
- Cigarettes now have a "list_reagents" var, for specifying their
initial reagents mix, like `reagent_container`

* Only trippy rollies start lit

* RRR
2017-04-12 21:14:22 +12:00
4dplanner 2f1f0da5be Adds another can_inject check just before injecting (#26001)
* Adds another check before injecting/applying medicals stacks

* More helpful comments

* Updates to use extra_checks
2017-04-11 15:25:07 +02:00
Lzimann d40760ad71 Fix conflicts 2017-04-07 09:12:36 -03:00
Cyberboss 9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
Lzimann 3a20f37034 Fixes chaplains not being able to assign their deity/religion plus some minor refactor of the religion subsystem 2017-04-06 23:44:13 -03:00
duncathan salt 525325b067 Merge pull request #25818 from AnturK/monkey_slots
Monkey fixes
2017-04-03 22:41:17 -06:00
AnturK 20b4d649d2 Fixes syringes for monkeys 2017-04-02 21:48:51 +02:00
Cyberboss 78ee754da3 Merge upstream 2017-04-01 23:38:37 -04:00
Joan Lung f693815bf5 Merge pull request #25683 from Cyberboss/patch-19
Fixes a bad arg runtime
2017-04-01 23:18:25 -04:00
ExcessiveUseOfCobblestone 0d3b8c075a Drink Responsibly [Drink Refactor and Shot Glass Tweak] (#25555)
* SHOTS SHOTS SHOTS

* Shots but for real
2017-03-31 08:30:58 +02:00
Cyberboss 1f3c5bded6 Fixes a bad arg runtime 2017-03-30 16:57:23 -04:00
Cyberboss 05e1ef69e1 Merge upstream 2017-03-27 09:32:08 -04:00