Commit Graph

10424 Commits

Author SHA1 Message Date
Fox McCloud dc089e3146 Merge pull request #2712 from Crazylemon64/mecha_mmi_fix
Mecha mmi Tweaks and Fix
2015-12-04 19:23:53 -05:00
TheDZD b0fd240083 Merge pull request #2721 from ZomgPonies/222
Nations 2.2.2
2015-12-04 16:05:18 -05:00
ZomgPonies f7bb7600ac Renamed 2 to DEAD 2015-12-04 15:57:05 -05:00
Crazylemon 6d44983a3e Revert "Testing out a new item declaration syntax"
This reverts commit b26ed9a950.
2015-12-04 12:52:31 -08:00
ZomgPonies 78c187254d Fixes #2726 2015-12-04 15:10:20 -05:00
Crazylemon b26ed9a950 Testing out a new item declaration syntax
Let me know what you think, I think this would work quite well for
furniture disassembly
2015-12-04 11:54:38 -08:00
Crazylemon64 9809a5fc1b Lots of cool fixes! Read below!
- Radio MMIs can now talk on the radio like a regular person does
- Same for MMIs in mechs
- A posibrain in a mecha doesn't lose its ability to hear binary chat
- Mechs now consume power when moving again
- Disassembling mecha wreckage now doesn't have a bunch of annoying "hit
  by" messages
- MMIs in someone's grasp no longer cause a rigsuit-related runtime
2015-12-03 23:46:10 -08:00
Fox McCloud 968bdda181 Merge pull request #2718 from Crazylemon64/cryotube_nodrop_fix
NODROP beakers won't summon yog-sothoth when placed in a cryo tube now
2015-12-03 12:41:22 -05:00
Crazylemon e877609de7 NODROP beakers won't summon yog-sothoth when placed in a cryo tube now 2015-12-03 09:24:36 -08:00
TheDZD 3f72596e62 Merge pull request #2612 from Aurorablade/Guardingthings
Fethas Carnival of Horrors part 4: I am in your greytide guarding ur newbs
2015-12-02 21:21:22 -05:00
TheDZD 2274c1806d Merge pull request #2696 from ZomgPonies/mecha
Speech Bubble fixes
2015-12-02 19:43:47 -05:00
TheDZD 07021e506b Merge pull request #2699 from Fox-McCloud/botany-qol
Botany QoL Changes
2015-12-02 19:15:17 -05:00
TheDZD cf18c90b94 Merge pull request #2710 from Fox-McCloud/player-spider-fixes
Player Spider Fixes
2015-12-02 19:02:23 -05:00
Fox-McCloud 82312c9e52 Player Spider Fixes 2015-12-02 18:14:01 -05:00
Crazylemon 13e2436934 Gives MMI Odysseus' medhuds, adds mech wreckage disassembly
MMIs can also be extracted without destroying the mech should they
permit maintenance protocols
2015-12-02 13:30:07 -08:00
ZomgPonies e793af5719 Adds giving custom rank to heir 2015-12-01 19:31:08 -05:00
ZomgPonies 900f20b9bd I -think- this is what you guys mean? 2015-12-01 19:06:57 -05:00
Fox McCloud c9c38597ad Merge pull request #2685 from Tastyfish/inputfix
fixed various inputs to be cancel-able
2015-12-01 17:56:16 -05:00
TheDZD f39d78af1d Merge pull request #2702 from ZomgPonies/nations221
Nations 2.2.1
2015-12-01 15:03:35 -05:00
ZomgPonies c7608bdacf Forgot a spare world 2015-12-01 03:44:51 -05:00
ZomgPonies 6e194ca5cf Fixed bugs 2015-12-01 03:29:46 -05:00
Aurorablade 09dbf83bef Treasure tweaks 2015-11-30 22:43:58 -05:00
Tastyfish 280fc65938 added cancel to more powers, hand tele, cleanups to others 2015-11-30 22:30:57 -05:00
Tastyfish 897313844b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into inputfix
Conflicts:
	code/modules/mob/living/silicon/robot/life.dm
2015-11-30 21:54:22 -05:00
TheDZD 6ed7724946 Merge pull request #2691 from Fox-McCloud/radiation-nerf
Rad Sickness Fix
2015-11-30 21:46:00 -05:00
Fox-McCloud f215983fc5 fix not balance 2015-11-30 21:37:41 -05:00
Fox-McCloud 0bbd8ea8d2 Botany QoL Changes 2015-11-30 20:03:59 -05:00
Fox-McCloud a3f7fe2c00 removed max() 2015-11-30 02:15:46 -05:00
Tastyfish b2abdd34c1 added input cancelling to pda msg, chemmaster ops, borg mod selection 2015-11-30 01:06:21 -05:00
Tastyfish 1627c6b124 made AI tracking cancel-able, fixed folder labelling 2015-11-30 01:06:21 -05:00
Tastyfish e2f67a4260 fixed various inputs to be cancel-able 2015-11-30 01:06:20 -05:00
Fox-McCloud 4b35bdb3fa Rad Sickness Nerf 2015-11-29 21:26:26 -05:00
ZomgPonies 172cdef1cc Typo fix 2015-11-29 20:27:46 -05:00
ZomgPonies a765d4587b Add the ability to choose a heir and for heir to takeover 2015-11-29 19:52:31 -05:00
ZomgPonies 127e0027e8 Clean up procs 2015-11-29 18:55:49 -05:00
ZomgPonies 9dca503d5b Ability for leaders to pick rank names for themselves and members 2015-11-29 18:30:02 -05:00
ZomgPonies 958c1dfcda Added one-time ability for leaders to rename nation 2015-11-29 17:29:15 -05:00
ZomgPonies bb470d2955 Kickoff Nation leader picking 2015-11-29 16:56:11 -05:00
TheDZD a915a5a0fb Merge pull request #2675 from Fox-McCloud/dwarves
Re-Adds Dwarf Mutation
2015-11-29 15:35:06 -05:00
TheDZD a2f6204a8b Merge pull request #2679 from Fox-McCloud/cash-update
Small Cash Update
2015-11-29 15:34:48 -05:00
Fox McCloud 37520dac7a Merge pull request #2676 from FalseIncarnate/master
Item Plants, Grown Weapons, Botany Fixes/Changes
2015-11-29 15:31:45 -05:00
Fox-McCloud ee93c40799 Small Cash Update 2015-11-28 15:40:20 -05:00
FalseIncarnate f2c530a580 Item Plants, Grown Weapons, Botany Fixes/Changes
Botany plants can grow preset items, mobs, or fruit
- Turns out that the code for mob harvestables could be used almost
unchanged to support item harvestables
- Changed some variable names to better reflect this

Re-introduces the Egg Plant!
- Grow eggs to throw at the security officer who confiscated your
ambrosia!
- Mutant species of Eggplants
- Exactly the same as eggs laid by chickens, except they shouldn't hatch

Adjusts code and logic order to avoid a conflict with TRAIT_SPREAD
fruits that can be converted into other items
- Grass, aloe, and comfrey were either unable to be converted or unable
to be planted outside a tray if they had TRAIT_SPREAD due to logic
ordering
- You must now be in DISARM intent to plant spreading fruits
- Being in HELP or GRAB will attempt to convert the fruit into a
poultice or other item as appropriate.
- If the plant does not have TRAIT_SPREAD, you may also use DISARM to
accomplish this

Adds Money Trees!
- Literally grows money-filled fruit called Cashpods
- Fruit contains gold and silver reagents, or can be turned into space
cash by using it in-hand like grass or aloe
- Value of the resulting space cash is related to potency. Higher
potency = higher dosh!
- Eating the fruit doesn't give you money, but may fill you with guilt
(not really).
- Mutant species of lemons.
- When life gives you lemons...

Adds the ability to convert sunflowers and novaflowers into their
"weapon" forms
- Done exactly the same as converting grass, aloe, comfrey, or cashpods
(use in-hand on help/grab intent)
- Sunflower conversion is silent, though the item description changes
- Novaflower conversion is not silent. You'll know when it happens.
- Hitting someone with a sunflower (weapon form) or novaflower (weapon
form) will assault both parties with a green and yellow message. FLOWER
POWER!
- Hitting someone with a novaflower (weapon form) will increase their
body temperature, and may cause burns as a result
- Picking up a novaflower (weapon form) without gloves will cause burns,
but doesn't drop the flower.

COMPLETELY DELETES the code\objects\items\weapons\hydroponics.dm file
- This file was 90% commented out already, and I moved the remaining
code into code\modules\hydroponics\grown_inedible.dm for organization
- This affects the .dme by removing a single line as the file is no
longer included.
2015-11-28 02:56:59 -05:00
Fox-McCloud c788811ae2 Re-Adds Dwarf Mutation 2015-11-28 01:29:47 -05:00
TheDZD 2bf228d0fd - Fixes #2669
- Re-orders code in simple_animal/vox.dm death() to be the same as it was previously, so that the Vox Armalis actually display a visible_message on death.
2015-11-27 18:43:01 -05:00
TheDZD dc94291235 - Fixes DNA injectors causing runtimes when injecting mobs with a null DNA var.
- Fixes statues and vox armalis simple_animal mobs causing infinite loops and crashing the mob controller on death.
- Fixes heavy lasers (and a few other unused projectiles) rotating incorrectly.
2015-11-27 18:23:39 -05:00
TheDZD 05e849a830 Merge pull request #2654 from Fox-McCloud/small-map-tweaks
Small Map Tweaks
2015-11-26 12:11:29 -05:00
TheDZD 13eb0f6723 Merge pull request #2655 from Fox-McCloud/poultices
Adds in Aloe Vera and Comfrey and Random Seeds
2015-11-26 12:11:26 -05:00
Aurorablade d42257b59e fixes and tweaks 2015-11-26 02:35:32 -05:00
Aurorablade a233403014 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Guardingthings 2015-11-26 01:53:53 -05:00