Commit Graph

11489 Commits

Author SHA1 Message Date
ZomgPonies
62f4f5cf66 Revolver stuff 2015-12-03 23:18:03 -05:00
Fox McCloud
a4b36540d8 Merge pull request #2706 from Crazylemon64/reclaimer_plasglass
Lets the ore reclaimer make plasma glass from plasma and glass
2015-12-03 17:43:11 -05: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
Aurorablade
7d6b6f9436 RAWRRGHHHH
FUCKING DEBUG PRINT
RAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHHRAWRRGHHHH
2015-12-02 21:06:13 -05:00
Aurorablade
e543062396 PAWNCYPAUNCH 2015-12-02 20:57:32 -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
cd3ce35f07 Merge pull request #2701 from Fox-McCloud/phlog-tweak
Phlog Nerf/Balance
2015-12-02 19:15:12 -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
b12ce7eb5a i r a gud pro gammer 2015-12-01 22:48:10 -08:00
Crazylemon
11562a8e03 Lets the ore reclaimer make plasma glass from plasma and glass 2015-12-01 22:19:54 -08:00
Fox McCloud
ca5362f055 Merge pull request #2687 from SvartaSvansen/more-char-setup
More character setup changes
2015-12-01 19:21:58 -05:00
ZomgPonies
900f20b9bd I -think- this is what you guys mean? 2015-12-01 19:06:57 -05:00
Fox-McCloud
afeb0f30ce Phlog Nerf/Balance 2015-12-01 00:32:42 -05:00
Tastyfish
f839b43bcc Merge remote-tracking branch 'origin/inputfix' into inputfix
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/game/dna/genes/vg_powers.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/economy/EFTPOS.dm
	code/modules/mob/living/silicon/robot/life.dm
2015-11-30 22:44:55 -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
Fox-McCloud
0bbd8ea8d2 Botany QoL Changes 2015-11-30 20:03:59 -05:00
TheDZD
aca9cf1650 Merge pull request #2694 from tigercat2000/fixes
Borg death fixes, human cleanup, carbon life tweaks
2015-11-30 19:46:54 -05:00
TheDZD
ff415212bf Merge pull request #2686 from ZomgPonies/nations22
Nations 2.2 -- Bookkeeping Boogaloo
2015-11-30 19:22:04 -05:00
TheDZD
42845228bb Merge pull request #2684 from Tastyfish/nanomaps
fixed nanoui maps positioning stuff wrong, atmos control having any alarms
2015-11-30 19:19:44 -05:00
ZomgPonies
c1a5f41680 Derp 2015-11-30 15:42:26 -05:00
ZomgPonies
5094a85160 Gives mechas speech bubbles. 2015-11-30 15:14:52 -05:00
Tigercat2000
b474b72ce5 Borg death fixes, human cleanup, carbon life tweaks 2015-11-30 07:16:35 -08:00
Aurorablade
2f28c537c4 Removes Null 2015-11-30 07:46:06 -05:00
Aurorablade
8b39fa3bb1 Fixes custom enemy communications 2015-11-30 01:25:12 -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
Tastyfish
e562d9d0c2 added input cancelling to pda msg, chemmaster ops, borg mod selection 2015-11-30 01:00:15 -05:00
ZomgPonies
6988ea6624 Missing brackets 2015-11-29 23:25:32 -05:00
ZomgPonies
a765d4587b Add the ability to choose a heir and for heir to takeover 2015-11-29 19:52:31 -05:00
Tastyfish
57ae7e1c9a made AI tracking cancel-able, fixed folder labelling 2015-11-29 19:40:23 -05:00
SvartaSvansen
528ad01873 The non-Vox are taking all the Vox socks! 2015-11-29 18:58:00 -05:00
Tastyfish
340068a25a fixed various inputs to be cancel-able 2015-11-29 18:30:30 -05:00
Tastyfish
559491810a fixed nanoui maps positioning stuff wrong, atmos control having any items 2015-11-29 17:50:17 -05:00
ZomgPonies
bb470d2955 Kickoff Nation leader picking 2015-11-29 16:56:11 -05:00
TheDZD
6a558196ca Merge pull request #2678 from Fox-McCloud/mob-faction-fixes
Simple Animal Faction Fixes
2015-11-29 15:34:58 -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
SvartaSvansen
af94d1bf6f Make color dialogs appear with current color. 2015-11-29 02:36:09 -05:00
FalseIncarnate
a3570a36c9 Grammar Fixes, Less Shouting (still praising)
Converting a novaflower to it's weapon form now has only a 10% chance to
actually make you shout "PRAISE THE SUN!"
- Rest assured though, that you will still be praising the sun
internally when doing this even if you don't shout it.

Fixes some grammar mistakes on the cashpod results.
2015-11-28 17:22:01 -05:00
Fox-McCloud
36d5b7636f Simple Animal Faction Fixes 2015-11-28 14:28:27 -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
dfd7b410cb Revert "Readds the old ponytail style" 2015-11-27 23:31:09 -05:00
Aurorablade
17864ddf4e REVIEW IT REVIEW IT NOW 2015-11-27 22:29:17 -05:00
Fox McCloud
0b429d8538 Merge pull request #2673 from TheDZD/fixes
Assorted Fixes
2015-11-27 19:53:35 -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
ee9a243b92 Merge pull request #2667 from Regen1/hair_fix
Readds the old ponytail style
2015-11-27 17:45:03 -05:00