Commit Graph
51 Commits
Author SHA1 Message Date
NikNakFlak fab4bcfeab Merge remote-tracking branch 'upstream/master' into makelife
Conflicts:
	code/modules/hydroponics/grown/citrus.dm
2016-08-23 17:08:36 -07:00
NikNakFlak d9ddba9361 Fixes a copypasta error 2016-08-23 16:59:10 -07:00
NikNakFlak b43ac4eb9c whoops 2016-08-22 15:25:25 -07:00
ExcessiveUseOfCobblestoneandoranges ac5bde1a7f Removes Partial Credits for Already Discovered Seeds + MoneyTree Potency Edit (#19975)
* Nerfs Seeds & Money Trees

* give them the D

* REMOVE IT ALL

* Update seeds.dm
2016-08-23 09:06:59 +12:00
Joan LungandGitHub 33b6445b64 Merge pull request #19730 from Ergovisavi/bonfire
Bonfires from Botany
2016-08-08 11:22:07 -04:00
Ergovisavi 28b476ab6d Bonfires from Botany 2016-08-08 04:07:18 -07:00
lordpideyandoranges 9d07476ab7 adds growth serum, puts it in fly amanita (#19654)
* adds growth serum, puts it in fly amanita

* changes reagent check to cycle check

* Growth serum now works, and if you have more than 20 units in you at a time, you will pulsate between sizes.

* Update other_reagents.dm

Removes erroneous typecast.
2016-08-05 11:58:19 +12:00
PKPenguin321andGitHub 50428a372c Replace istype with is_sharp
For carrot shiv creation
2016-07-18 21:45:25 -07:00
Firecageandoranges da3da71e29 Misc Botany changes. (#19240)
* Names the cannibas leaves and enables weapon/grown to be added to the smart fridge

* Gives cannabis seed packets sprites consistent with other seed packets, and so they also look different.
2016-07-11 19:11:54 +12:00
IamgoofballandKorPhaeron 3e349b75ea Fixes Omega Weed (#19229)
* Fixes Omega Weed

well i put an extra 0 in there

* I told you it was reasonable oranges
2016-07-09 21:38:19 -04:00
Iamgoofballandoranges 5755a4180a #FEELTHEGOOF Election PR: This is what the local conservative radio said all sanders voters wanted (#19105)
Added a new plant to the game to encourage the Chef to be a more relevant job, alongside a recipe for a food related to it. Throw a cannabis leaf on a table and check the recipes list to find it.
2016-07-09 18:14:59 +12:00
bgobanditandoranges 10d32cd9d4 Fixes/tweaks a lot of typos/descriptions. (#18956) 2016-06-28 22:02:28 +12:00
Kyle Spier-SwensonandAnturK 0d6bbbb412 stop the pills (#18703)
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
2016-06-20 12:07:44 +02:00
Xhuis 7bd5dd5168 Makes cherry bombs auto-delete on explosion 2016-06-17 10:51:51 -04:00
Xhuis 6289801964 Hydroponics changes 2016-06-17 10:46:55 -04:00
orangesandGitHub 9c451faa2c Merge pull request #18534 from Core0verload/ash_fix
Fixes unkillable ash drake (+ more runtime fixes)
2016-06-15 10:44:20 +12:00
c0 9fdbe269d6 More fixes 2016-06-13 12:43:25 +03:00
orangesandGitHub 99620ffe76 Merge pull request #18481 from phil235/PlantsGunsShit
Moving code around
2016-06-13 00:14:29 +12:00
Jordie0608 0846d6f30d fixes fire logging bracket 2016-06-12 20:58:55 +10:00
XhuisandKorPhaeron 25a638d6af Removes cherry bombs (#18461) 2016-06-12 02:01:16 -05:00
phil235andphil235 dccc1e60a3 Let's not forget the new files.
Also some tiny fixes, typo, and things I forgot.
2016-06-11 23:52:35 +02:00
phil235andphil235 3b8af6f5ff Fixes grille/New() not calling ..()
Blood drips icons are now in blood.dmi instead of drip.dmi (which only had the 5 drip sprites).
Moved projectiles, guns, casings and ammo boxes to be in the right files. Please don't put your gun with its projectile, ammo casing and ammo box all the same file.
I split growing.dmi into 5 smaller files so we don't get close to the 512 icon limit again. Each seed has a var to indicate which icon file to use when planted.
Fixes code for heavy pulse laser projectile to be less awful.
2016-06-11 23:18:26 +02:00
JordieandGitHub 0777916328 Merge pull request #18402 from optimumtact/flamingfunremoval
Better logging and notification of setting on fire
2016-06-11 23:53:34 +10:00
oranges bf9643563d Ensure we only log and notify admins when person is set on fire
This takes advantage of the now refactored IgniteMob returning true when
it successfully ignites the mob
2016-06-11 13:08:05 +00:00
drynwynandGitHub 14bdb5995d Removes superfluous faction adding. 2016-06-10 11:13:26 -04:00
drynwynandGitHub df6d3e6da2 Adds factions to pod people 2016-06-10 02:12:00 -04:00
Xhuisandoranges 68b51d88cf Hydroponics tray changes and new plants (#18366)
You can now remove all plants and weeds from a hydroponics tray by using a spade on it. This process takes five seconds.

Hydroponics trays now have a unique variable, using_irrigation, that replaces the previous iteration of irrigation hoses that used the anchored variable to track it instead.

Fixes a possible runtime error that can occur when using irrigation hoses to transfer non-water reagents (specifically nutrients, although it hasn't been tested with any other reagents).

Added meatwheat, which is mutated from normal wheat plants. It's essentially a blood-red version of wheat that can be crushed into a meat slab by activating it with an empty hand. These meatwheat clumps are slightly bloodier than normal meat, but it still works for recipes that use normal meat slabs.

Added ambrosia gaia, which is mutated from ambrosia deus. It's yellow, glows brightly, and contains only earthsblood (renamed adminordrazine). The plant is destroyed after a single harvest, and its product can be planted in an empty hydroponics tray to cause it to become self-sufficient, no longer requiring nutrients, water, or weed/pest removal. Gaia-blessed trays will glow bright yellow in comparison to normal trays, and gaia-blessed soil will turn yellow. Both will emit light.

Added cherry bombs, which are mutated from blue cherries. They're orange and have a black stem, and start with a tiny amount of black powder in them. Activating them in an empty hand will ignite them and cause them to explode after three seconds, with explosion strength varying based on potency (at the most, it's around that of a minibomb).
2016-06-09 18:40:06 +12:00
oranges 59b72ec25c Better logging and notification of setting on fire
This also logs bump fire to the gamelog incase someone ever needs to
find out who set who on fire with bumping (left out of admin
notification) as it would be very spammy
2016-06-09 06:31:23 +00:00
LatD 7d6b3e6847 origin and req lvl changes 2016-05-21 17:17:20 +03:00
LatD fe76e64641 Origin tech changes and some fixes 2016-05-17 20:57:01 +03:00
lordpideyandRemie Richards 24f47b0223 Devil Antag Round 2. (#15794)
* Re-making the branch and PR of demon.  See #15118 for the old PR

* Adds toy demonologist to arcade machine reward list.

* Implemented two suggestions: Pitchfork now has a demonic subtype, to potentially give botanists a normal pitchfork.

Suiciding with signed contract now uses forcesay instead of say.

* Fixes compile errors.
Re factors contracts to be subtypes rather than datums.  <--- incomplete, still need to summon them appropriately.

* buffed infernal power contract to give passive healing
Nerfed magic power contract to not give robeless MM

* Fixes compile errors

* Corrects orientation of true demon sprite

* Begins work on the sNPC for the true demon/ arch-demon

* Added funeral garment sprites.  These will be used in banishment rituals (hopefully)

* Stashing my work so I can move to another computer.

Re-working the true-demon, it will be a carbon rather than a simple mob.

* Revert "Stashing my work so I can move to another computer."

This reverts commit e8b1e032997b7e17af4ad8630bf21d3620195c4e.

* Git exploded for me, so I have to make a new branch with EVERYTHING.  sorry.

* Fixes compile error

* Ghosts can now click on an arch demon to become a slaughter demon

* Begins to convert demons into a carbon rather than simple mob.

* Demons now resurrect if not banished.

* Beepsky now properly tells security chat about the level 666 threat.

* Contracts now work again.

* old spells now get removed properly.

* adding pitchfork sprites

* Adds hud for the true-demon.  Not functional.

* Fixes another error in the demon hud.  Still broken.

* Demons are no longer immortal, demon huds work properly now.  (it's barebones, but it works.)

* Fixes the "Have mortals sign at least # contracts of TYPE" objective

* Fixed typo in banishlore() and updated wrath/envy sintouch objectives.

* Adds huds for demons/sintouched/soulless, however they are currently unused.

* Updates the demon's hud to work with the recent hud changes.

* Cleaned up infernal jaunt, it works a lot better now and is less buggy.

* Revival contracts now actually take your soul.

* Fixes #16513

* Replaces the infinite slaughter demons with infinite imps.  Sprites for imps are still needed.

* Adds sprite for imps.  It's a redder, smaller slaughter demon.

* Fixes lack of icon for pitchforks

* Gives summon wealth a more appropriate icon.

* Fixes small part I forgot to merge.

* Fixes a few bugs with demonic resurrection.  It's still very buggy.

* Derp, my bad, I didn't mean to admin myself on the main server.

* Fixes edge case of demonic resurrection failing.  Debraining the demon is NOT supposed to be an alternative for the banishment ritual.

* Also did not mean to change this config file.

* Fixes another error in type 1 demonic resurrection.  It works properly now.

* Updates employment contract text.

* Fixes type 2 resurrections.
Demonic contracts are once again permanently on fire.

* Replaces toy demonologist with toy demonomicon.  It still works the same, just different icon/name.

* Adds demonomicon and employment cabinet to box/meta/dream/efficiency.

I could not add it to mini/bird due to conflicts.

* Edits ministation and BirdStation to have demonomicons and employment cabinets.

* Fixes spelling error

* Adds burial garments to maps.

* Update photocopier.dm

Fixes the span when inserting items into photocopier

* Fixes disrupt_spells proc

* Makes a lot of changes as reccomended by Remie.

* Fixes a compile error.

* Updates the lawify/loreify to be lists.  Does not compile.

* Fixes compile errors.

* Arch demons no longer regress upon death.
Speaking a demon's truename gives the demon the opportunity to teleport to you.
Makes demonomicon not care about capitalization.

* Fixes startup error.  Demonic summoning now works.  It's very simple, just say their true name.

* Demons now have a tongue.  True demon bodies are deleted upon regression.

* Demons can now be punched.
Demons can no longer resist a fire out, since it does nothing to them.

* true demons show up in player panel.  Hellfire works again.

* Prepares for commit 16940

* Demons are now known as devils.

Still needs testing.

* Oops, didn't commit everything last commit.

* Finishes converting demons to devils.

* Fixes speech for lizards/flymen when they speak a demon's name.

* Update tips.txt

* Changes variable from static to global as per Remie's suggestion.

I disagree with Remie's assessment, as a list that will never change, even between games, seems like it should be static.

* Removes devil summoning.  Hopefully, I'll be able to eventually find a way to implement it satisfactorily, but for now, I'll leave it out.

* Removes carriage returns

* Combined modified icon files

* Fixes #17184

* Imps no longer show up in the end round report.  This is because there can EASILY be 100+ imps if the crew is well armed.

Non-employment filing cabinets no longer take 30 sec to wrench/unwrench.

* The lawyer can actually buy souls back now.  Oops.

* Fixes true/arch devil spritesheet to have correct sprite names.

* Relocates Box's employment cabinet to Law office.

* De-devil-ing someone now removes the devilinfo.
De-devil-ing now returns an error when used on true and arch devils

* Re-factors whiteness code for jumpsuits.

* Merges icons, reverts failed merge of map

* Merges map with CAS decks

* Fixes copying employment contracts

* Derp, fixes compile error.

* Replaces antaghud with customizable vision range for knowledge boon.

* Prevents a runtime if devil is gibbed while ascending.

* Neatens contract code, and removes excess variable from humans.

* Fixes compile errors

* Organizes weakness code slightly.  Adds ability for a species override on weakness.  (Make flypeople take 2x damage from flyswatters for example)

* Removes sixteen erroneous characters from the codebase.

* Removes trailing return

* Makes typeless for loops, removes a runtime, and removes unhelpful comments.
2016-05-08 18:44:27 +01:00
phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
phil235 68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
xxalphaandKorPhaeron 1b22679195 Fixes and buffs the banana shoes (#17305)
shhh
2016-05-04 12:25:23 -05:00
duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
LatD 62f93b7a32 Adds hydrogen to grass 2016-04-01 00:09:33 +03:00
duncathan e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
KorPhaeron 6df3dd47d6 Merge pull request #16266 from Lumipharon/botany5001
Makes some plants a bit better
2016-03-22 19:24:59 -05:00
Lumipharon acb3941312 Improved various plants and added extra chemicals to others - Being a botanist should now be more FUN. 2016-03-22 00:07:11 +13:00
c0 a707a54489 fixes broken sprites and broken clown banana 2016-03-14 09:30:11 +03:00
c0 e4f2d0c064 Bioengineering Part 1 2016-03-13 13:20:26 +03:00
c0 6b7774a1de fixes 2016-03-11 09:52:20 +03:00
c0 410ad60750 fix 2016-03-09 09:30:07 +03:00
c0 240fd5bc05 Plant Refactor: Genesis 2016-03-09 09:29:37 +03:00
c0 08bdcc3024 Plant Refactor 4 2016-03-07 12:46:12 +03:00
c0 9f302e6ed4 Fixes a nasty banana teleport bug 2016-03-07 05:38:47 +03:00
c0 3d0792c003 Plant Refactor: Icons 2016-03-07 05:38:45 +03:00
MenshinandMenshin 9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
c0 a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
c0 b6ff8f5919 Splits grown.dm into subfiles completely 2016-03-03 06:13:12 +03:00