Commit Graph

2100 Commits

Author SHA1 Message Date
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
Leo
e730f2685f Weldertanks are now logged in the attack log instead of game log. Also logs in the individual's mob attack log. (#24474) 2017-02-27 18:57:24 -06:00
Dannno
88d417bcb6 add flavor fix poster 2017-02-23 17:32:14 -05:00
WJohn
a13a52a98f Merge pull request #24348 from dannno/vendy
Sodie pops
2017-02-23 07:55:34 -05:00
coiax
05026eee88 Taste (#24323)
* Adding taste to reagents

* Toxins mostly taste bitter.

* The taste of medicine is mostly bitterness

* Drugs taste bitter too

* It turns out pyrotechnics mostly taste like burning

* Alcohol and blob tastes

* Drinks taste mostly of drinks

* And the food reagents are the last, but not least

* Actual taste code

* You can now taste freshly spawned carrot cake

* Bread, burgers

* Debugging tasting

* Always add the reagents properly, I guess

* Finally got nutriment scaling working

* Finally got all the stuff working and mixing

* PEOPLE CAN NOW TASTE THINGS

* Mouthful only has one L

* Meat n dough

* Eggs and cakes

* Meat dishes taste of meat

* Others...

* Pastry... there is no end to the food

* PIE AND PIZZA

* SANWHICHES, SALAD, SOUP

* THE LAST OF THE FOODS ARE COMPLETE

* Weird indentation issues fixed

* Remove dat debug code

* Hydroponics and sugar is less strong

* Replaces carrot cake reagents

* Code review

* Fixes bad flavours
2017-02-23 00:59:34 -06:00
Cyberboss
56a6eaa8e6 Overlay queuing (#23922)
* Overlay queuing

* Fix SS flags

* Don't copy on assignment

* Flags processing

* Fix icon_smoothing

* MSO's helper proc

* Legacy detection

* Make it work

* Fixes shitcode

* Fix the flag

* |= -> +=

* OK, how did I fuck that up?

* shitcode

* Conditional assoc queue while initializing

* Cleanup everything

* Orange meme

* This isn't perfect, but its the best byond will give us.

* forgot about dir

* oh ya

* This was litterally the last thing i did last night before heading to bed

You can tell can't you?

* Fixes various shit

* Let's not ever pause

* Fix the flag

* Cleaned up some missing shit. Added image dummys

* Remove the one usage of FPRINT

* Jesus get rid of this
2017-02-22 21:44:55 +13:00
Dannno
727cc8fea0 why god 2017-02-20 18:33:49 -05:00
coiax
de0b29dea6 Partially grown clones are horribly disfigured + cardiac arrest refactor (#24106)
add: Refactors heart attack code, a cardiac arrest will knock someone unconscious and kill them very quickly.
add: Adds corazone, an anti-heart attack drug, made by mixing 2 parts Phenol, 1 part Lithium. A person with corazone in their system will not suffer any negative effects from missing a heart. Use it during surgery.
add: Abductor glands are now hearts, the abductor operation table now automatically injects corazone to prevent deaths during surgery. The gland will restart if it stops beating.
fix: Cloning pods always know the name of the person they are cloning.
add: You can swipe a medical ID card to eject someone from the cloning pod early. The cloning pod will announce this over the radio.
del: Fresh clones have no organs or limbs, they gain them during the cloning process. Ejecting a clone too early is not recommended. Power loss will also eject a clone as before.
del: An ejected clone will take damage from being at critical health very quickly upon ejection, rather than before, where a clone could be stable in critical for up to two minutes.
add: Occupants of cloning pods do not interact with the air outside the pod.


After @Cyberboss 's multi-pod cloning got merged, I scrapped the multi-pod stuff from my own work, and brought back the maiming.

Early ejected clones being partially disfigured is a cool feature.

This penalises (but does not completely remove) speed cloning, as there is a window where the clone can be ejected without missing any limbs or organs. Otherwise the clones will probably die due to lack of lungs or heart.

Heart attacks are more lethal, there's an easy medicine for treating them, if chemistry have it on hand.

Clones not reacting to the air around them is a buff to plasmamen (although they'll still burn to death once they're ejected in an oxygen atmosphere).
2017-02-21 11:13:54 +13:00
oranges
5ba698c6ae Merge pull request #24254 from Xhuis/fix_bundle
Fixes reusable epipens
2017-02-20 17:09:54 +13:00
Xhuis
93d8fbe908 REEEEEE 2017-02-18 17:52:05 -05:00
Xhuis
464512f35b Fixes reusable epipens 2017-02-18 17:03:59 -05:00
Pieter-Jan Briers
b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00
scoopscoop
514263f6c0 Tweaks condimaster layers (#24108)
* The condimasters on the eastern side of metastation should stop annoyingly ejecting their beakers behind themselves

* Actually this might be a better idea

* Defines!
2017-02-18 11:21:14 +13:00
XDTM
6d1b976cbf Adds a bluespace crystal material, balances some R&D recipes around it. (#23984)
* Everything

* FAKE CRYSTALS

* make up your mind

* eat your bluespace, dear

* Reverts upload board cost, increases power of reaction_mob teleport
2017-02-17 09:50:49 +13:00
Jordie
ff77631a8d Merge pull request #24024 from RandomMarine/pillsplitter
Splits charcoal pills apart
2017-02-14 10:57:44 +11:00
kevinz000
4af765bbc6 [READY]adds logging to spilling plasma from beakers in theory (#23926)
* Update reagent_containers.dm

* Update glass.dm

* Update reagent_containers.dm

* Update glass.dm

* Update reagent_containers.dm

* Update reagent_containers.dm

* Update glass.dm

* Update glass.dm

* Update reagent_containers.dm
2017-02-14 10:54:49 +11:00
RandomMarine
6cfa865b4c splits apart charcoal pills 2017-02-12 08:40:22 -08:00
PJB3005
f11c558c99 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-12 16:35:57 +01:00