Commit Graph

2117 Commits

Author SHA1 Message Date
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
Enlightening ce23a1d059 Fixes rice turning into nutriments when grinded (#25467)
* Fixes rice turning into nutrients when grinded

Fixes rice turning into nutrients when grinded

* Fixes sprinkled donuts not producing sprinkles
2017-03-25 15:20:50 -04:00
AnturK 27719ab85e Misc runtime fixes (#25428)
* Fixes chameleon gun runtime

* Fixes canister runtime

* Fixes reagent runtimes
2017-03-24 19:33:28 -03:00
Cyberboss cd050a38f0 Merge branch 'master' of https://github.com/tgstation/tgstation into TiredOfTheInconsistency 2017-03-24 16:34:20 -04:00
Joan Lung 0cc1aaed52 Blazing Oil takes 33% less damage from water 2017-03-22 22:27:49 -04:00
Cyberboss d0bfbc3e13 Rename ticker to SSticker 2017-03-22 10:48:25 -04:00
Iamgoofball 1cb5b7a569 Fixes phlog firestacks (#25326) 2017-03-21 17:36:29 -03:00
oranges 9aaff6e281 Fixes sinks giving misleading messages when containers full (#25037)
* Sinks will now give a message when the reagent holder is full

This also adds a helpful proc to check a reagent holder is full

* It was one character
2017-03-15 16:38:33 -04:00
oranges d003126824 Merge pull request #24893 from jughu/demote-jughu-pr-request
Fixes anti toxin pill name
2017-03-11 17:45:59 +13:00
PKPenguin321 e328605111 Readds clonexadone, nerfs cyroxadone's cloneloss healing (#24638)
* readds clonexadone, nerfs cyroxadone's cloneloss healing

* slightly increases clonexadones metabolism rate
also updates its description
2017-03-11 17:05:24 +13:00
Lzimann 5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Mike Long e9fe283494 Adds glitter bombs (#24700)
* Adds glitter bombs

* Fixes blue glitter description
2017-03-10 11:44:59 +13:00
jughu 33a80940dd Update pill.dm 2017-03-09 20:44:01 +01:00
Joan Lung d5c870e714 Merge pull request #24662 from lzimann/individuallog
Adds a way to see a persons's individual logs for the round.
2017-03-05 11:57:37 -05:00
Lzimann e58ee1724f Refactors logging into a single var for all mobs and adds a wrapper for proper logging. 2017-03-04 13:32:35 -03:00
PJB3005 a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
XDTM 5e91119fce [Ready]Hallucinations 2.0 (#24478)
* Hallucinations 2.0

* click defines

* tesla sounds and borer

* Fake doomsday and zombie delusion

* death message realism, less spawn, more first_name()

* fix + self delusion

* YUP THAT WAS ALL IT WAS NEEDED TO ENABLE SMOOTH HALLUCINATION MOVEMENT

* oh yeah

* realistic death + tweaks

* bubbleturn

* New fake alert hallucination

* dangerous

* defines and one less spawn

* New -> Initialize

* Initialize fix + new items_other hallucination

* extreme sound realism

* the error is always in the change you don't test

* mo' speech, better speech
2017-03-03 11:20:02 +13:00
Jack Edge afc585c95c Clones no longer gasp for air in cloning pods
🆑 coiax
fix: Clones no longer gasp for air while in cloning pods.
add: Adds a new reagent, "Mime's Bane", that prevents all emoting while
it is in a victim's system. Currently admin only.
/🆑

- Clones keep gasping a lot, either because they're not in an oxygenated
environment, or because they start in crit. This fixes that in a fairly
clean manner, and also adds a "fun" reagent to give to evil clowns or
something.
2017-02-28 18:32:34 +00:00