Commit Graph

645 Commits

Author SHA1 Message Date
Cyberboss
d787a39b7a Removes the shadowshroom admin message 2017-05-24 09:47:41 -04:00
Leo
7d91e3143d Changes investigate logs to use a define (#27503) 2017-05-23 15:45:09 +12:00
fludd12
b465361a6d Adds Bonfire Grills (#27250) 2017-05-16 11:27:08 -03:00
oranges
1633062837 Merge pull request #27214 from FantasticFwoosh/Starthistle
Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
2017-05-16 10:03:55 +12:00
Joan Lung
d8103e6696 Glowshrooms have a less saturated glow (#27217) 2017-05-14 13:30:55 -03:00
octareenroon91
9a9b4b66d0 Enable Ambrosia Gaia, attempt balance (#27244)
* Improve Gaia

alea acta est

* Remove Gaia from attackby

* Move Gaia behavior to reagent addition

* Enable mutation between A Deus and Gaia.
2017-05-14 11:45:20 -04:00
uraniummeltdown
807f9e77ab brings back gaia mutation (#27216) 2017-05-14 11:42:22 -04:00
FantasticFwoosh
9af391cecf Removes implied src
Playtested works out ok.
2017-05-13 21:35:48 +01:00
FantasticFwoosh
bb4e7fcfb3 Adjust weed invasion for starthistle
seed/weed is now seed/starthistle in accordance to changes to the weed plant in grown misc
2017-05-13 11:57:00 +01:00
FantasticFwoosh
6f4eb8b9cb Updates and fleshes out "weeds" into starthistle
Seeds/Weeds is now referred to as seeds/starthistle, it has undergone description changes, statistical changes (nerfed lifespan, added yield & potency) & also re-enabled use of its broken tray sprites. Finally it has a adopted new system where it will return seeds instead of dispense produce like a replica plant.
2017-05-13 11:51:16 +01:00
Iamgoofball
f9ebdf1b41 Disables Gaia mutation (#27144) 2017-05-12 21:30:00 -04:00
XDTM
e3fceecd23 Nettles won't pierce PIERCEIMMUNE species 2017-05-07 11:49:57 +02:00
Leo
3b9b4e0755 Changes a bunch of hrefs to the proper defines (#26760) 2017-05-02 01:19:51 -06:00
4dplanner
bd9b242575 Plants now react with turfs on squash() (#26752) 2017-05-01 16:34:29 -06:00
Cyberboss
d7469744ff Fixes some null.add_reagents runtimes 2017-04-29 16:09:57 -04: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
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
Cyberboss
d6fef1d8fd Improves the spacevine controller 2017-04-13 14:37:48 -04:00
coiax
611ecb13fe Fixes plant batteries having strange names (#26126)
It would include "the" in the name, which is silly.
2017-04-13 06:41:29 -04:00
Cyberboss
b83f47ccc7 Ports honey_frames to Initialize 2017-04-11 01:39:24 -04: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
AnturK
1b138562b4 Minor runtimes fixes. (#25566)
* Fixes power monitor runtime

* Fixes reagent data runtime

* Nullspace is no smoking zone
2017-03-29 19:21:51 -03:00
octareenroon91
2725ee99ec Fix bonfire/buckle_mob() runtime (#25527) 2017-03-27 21:13:20 -03:00
ExcessiveUseOfCobblestone
3a562029ea [embarrassing] gene machine hotfix (#25307)
* EMBARASSING!

* CRAWLING IN MY SKIN
2017-03-22 10:41:18 +13:00
Joan Lung
942cc65ffe Merge pull request #25225 from ExcessiveUseOfCobblestone/forgive-me-gene-machine
Tasteful Botany Nerf
2017-03-19 16:30:08 -04:00
ExcessiveUseOfCobblestone
f2f0bdc5e8 Does The Remie 2017-03-19 16:03:36 -04:00
ExcessiveUseOfCobblestone
b650eddaed Removes a comment 2017-03-18 18:18:07 -04:00
ExcessiveUseOfCobblestone
4b5b7ea41a *sigh* XDTM 2017-03-18 14:00:59 -04:00
ExcessiveUseOfCobblestone
84659459d2 STUPID SEED VAULT CHECK 2017-03-18 00:40:18 -04:00
ExcessiveUseOfCobblestone
65f3af3ec7 Gene Machine! 2017-03-18 00:18:17 -04:00
uraniummeltdown
2ba2dd5d1d plant data disks use new sprite from baystation 2017-03-17 16:22:24 +04:00
Joan Lung
efed08c420 Shadowshrooms are much less powerful (#25031) 2017-03-13 20:46:55 -04:00
Joan Lung
7fa907ed81 Adds Shadowshrooms as a glowshroom mutation (#24898)
* Adds Shadowshrooms as a glowshroom mutation

* why the fuck would I do that
2017-03-11 05:18:43 +03:00
Lzimann
5a618297ce Replaces the default output with the to_chat wrapper. 2017-03-10 01:32:05 -03:00
Joan Lung
a73cb2cfce Not Bioluminescence 2017-03-06 20:41:36 -05:00
Joan Lung
08cc485e98 glowy shit 2017-03-06 20:35:57 -05:00
Joan Lung
10100f1d9f Glowshrooms now have colored light 2017-03-06 13:19:40 -05:00
PJB3005
a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
ExcessiveUseOfCobblestone
dcaeccf2b3 Fixes Gatfruit (#24469)
* Oh Cyberboss

* Update grown.dm
2017-02-28 18:04:12 +13:00
militaires
ac701e9299 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_3/4
# Conflicts:
#	code/game/machinery/cloning.dm
2017-02-24 11:54:55 +03: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
militaires
a9c0e59aba pls 2017-02-20 23:06:05 +03:00
Pieter-Jan Briers
b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00
bgobandit
b22e689417 Fixes some more goddamn typos and bad writing. (#24095)
* fixes some more goddamn typos

* ree

* ...

* seething hatred for typos

* wew
2017-02-17 14:10:58 +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
PJB3005
8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
Cyberboss
b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00
Pieter-Jan Briers
aeb057579e Hey it almost works 2017-02-04 01:00:12 +01:00
oranges
ea7e81deb5 Merge pull request #23453 from Fox-McCloud/plant-analyzer
Plant Analyzer Info Tweak
2017-01-31 09:30:06 +13:00