Commit Graph

4933 Commits

Author SHA1 Message Date
Fox McCloud
b0be9925d3 Merge pull request #2780 from RudiPardieck/deflation
bugfix: inflatable doors no longer disappear when deflating non-viole…
2015-12-08 22:03:02 -05:00
TheDZD
23b405a905 Merge pull request #2777 from RudiPardieck/grammar-fix
Fixes mistakes with using /improper instead of \improper
2015-12-08 22:01:25 -05:00
TheDZD
55e0ac4507 Merge pull request #2770 from Fox-McCloud/bacpacks-and-stuff
Backpack Fixes and Port
2015-12-08 22:00:50 -05:00
Certh
522a7b7ac5 bugfix: inflatable doors no longer disappear when deflating non-violently 2015-12-08 16:45:27 +01:00
Certh
d665bb0729 Fixes mistakes with using /improper instead of \improper 2015-12-08 10:37:42 +01:00
Fox-McCloud
00800803ff Backpack Fixes and Port 2015-12-07 19:11:24 -05:00
Certh
6bdad2a9d9 The examine line of the safe was broken due to w_class being above 5. Tuned it down to 5 (huge item) 2015-12-07 16:33:44 +01:00
Certh
591daf04d2 Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).
Also corrected some periods, spelling errors etc. along the way.

If this PR seems familiar, a part of this is of an earlier PR that I messed up.
2015-12-07 16:14:26 +01:00
TheDZD
5984e9049f Merge pull request #2752 from RudiPardieck/master
Fixes issues with two handed weapon sprites
2015-12-06 16:00:17 -05:00
TheDZD
c3b52b2506 Merge pull request #2736 from Crazylemon64/odysseus_resistance
Resist to escape an odysseus' sleeper
2015-12-06 15:59:08 -05:00
Certh
fc3d211aa2 Fixes issues with two handed weapon sprites 2015-12-06 17:15:27 +01:00
Crazylemon64
6fed7d7648 Somewhat desnowflaked resistance 2015-12-06 00:17:25 -08:00
Crazylemon64
9241442cc6 Some fixes to robotics surgery
Internal organ fixing surgery will now work correctly on robotic organs,
using nanopaste in place of trauma kits

Defibs also don't need the body to be past the point of deadness to work

Kitchen utensils should now properly work as surgery tools where given in
code

IPC thralls can now be dethralled by performing the surgery on where their
brain is, in this case their chest. This will also work for any species
that has a brain anywhere else in their body.
2015-12-05 01:35:59 -08: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
Tastyfish
280fc65938 added cancel to more powers, hand tele, cleanups to others 2015-11-30 22:30:57 -05:00
Fox-McCloud
0bbd8ea8d2 Botany QoL Changes 2015-11-30 20:03:59 -05:00
Tastyfish
b2abdd34c1 added input cancelling to pda msg, chemmaster ops, borg mod selection 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
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
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
ZomgPonies
3cb7ec5e08 Bunch of robutt stuff 2015-11-25 22:41:09 -05:00
TheDZD
d79c278fce Merge pull request #2625 from Aurorablade/FixyFixy
[Fix] Ghost in the Swarming Shell
2015-11-25 20:06:39 -05:00
TheDZD
1b5b56f1ac Merge pull request #2656 from RudiPardieck/master
Fix for harm intent not working on white ui
2015-11-25 19:55:14 -05:00
Fox-McCloud
52d13d6035 more tweaks 2015-11-25 02:42:13 -05:00
Fox-McCloud
a5b9f5f78e Adds in Aloe Vera and Comfrey 2015-11-25 01:37:58 -05:00
Fox-McCloud
6e4817fdce Merge remote-tracking branch 'upstream/master' into plushies 2015-11-24 21:34:29 -05:00
Aurorablade
1e83404b80 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into FixyFixy 2015-11-24 21:17:35 -05:00
TheDZD
0f48177082 Merge pull request #2637 from Tastyfish/path_cleanups
Cleaned up /datum/effect/system paths & some bad path defines
2015-11-24 19:59:46 -05:00
Tastyfish
317760a7de Merge remote-tracking branch 'upstream/master' into path_cleanups
Conflicts:
	code/modules/examine/descriptions/atmospherics.dm
2015-11-24 18:05:01 -05:00
TheDZD
8ee8eb0234 Merge pull request #2636 from ZomgPonies/action
Adds action figure toys
2015-11-24 17:13:38 -05:00
TheDZD
3d8ebd680a Merge pull request #2633 from ZomgPonies/hulk
HULK fixes and balance
2015-11-24 16:47:35 -05:00
Aurorablade
8f3727b35d silly ghosts, you do not step on glass... 2015-11-24 15:42:09 -05:00
Certh
80f64e73df Fixed text error when using blueprints 2015-11-24 16:19:11 +01:00
Tigercat2000
b37d04d567 Fix tank UI bugs. 2015-11-24 07:08:02 -08:00
Certh
1ce08fee64 Tiny grammar fix 2015-11-24 16:03:16 +01:00
ZomgPonies
0a318a445f Makes them spawn randomly in the arcade machines 2015-11-23 21:55:20 -05:00
Fox-McCloud
d38e48f74c oops 2015-11-23 21:23:14 -05:00
Fox-McCloud
f21b29f260 Adds Plushise--Arcade Changes 2015-11-23 20:54:41 -05:00
ZomgPonies
01b8abb030 Forgot to call parent 2015-11-23 16:03:56 -05:00
ZomgPonies
a462fb21e0 Minor fixes. 2015-11-23 12:18:35 -05:00
Aurorablade
677b38304d well this escalated quickly 2015-11-22 23:16:30 -05:00
ZomgPonies
8093818847 Adds action figures 2015-11-22 19:48:38 -05:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00