Commit Graph
3059 Commits
Author SHA1 Message Date
Fox-McCloud e3965c7e7c derpy fox is derp 2015-12-14 19:07:42 -05:00
Tastyfish 21d04ecfbf removed radio hear_message per fox's request 2015-12-13 20:49:16 -05:00
Fox McCloud 2bcd0dbe3d Merge pull request #2831 from Spacemanspark/NTSAM-focuses-on-too-many-details
Grammar fixes.
2015-12-13 20:34:19 -05:00
Fox-McCloud 74e22e2041 Action Figure Tweak 2015-12-13 20:32:12 -05:00
Spacemanspark 1aad24ae4a Grammar fixes.
@NTSAM
2015-12-13 19:03:23 -06:00
Tastyfish d1fa228b19 Fixed hologram hearing, megahones, intercoms&tape recorders picking up emotes in room 2015-12-13 18:29:27 -05:00
Tigercat2000 0e3c1f7fc6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-13 09:25:04 -08:00
Tastyfish f39649be57 added hear_message, like hear_talk but for audible emotes, voice analyzer & newscaster support 2015-12-13 04:36:41 -05:00
Tigercat2000 3d71483372 /vg/ / -tg- asset_cache
Port of -tg-'s port of /vg/'s asset cache
Funny thing is, this actually replaces an old version of /vg/'s asset
cache we already had
IT'S A PORT OF A PORT REPLACING A PORT
POOOOOOOOOOOOOORTCEPTION

Basically, gets rid of the 30-40 second interface lag when you first join,
via *mumblemumble* MAGIC!

Also moves a few nano files around.
2015-12-12 21:25:04 -08:00
Fox-McCloud a2d10c4c49 Cell Weight Class and Tech Fixup 2015-12-12 22:40:02 -05:00
Aurorablade 950ae86a92 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-10 06:47:43 -05:00
Aurorablade c590958f2d Hud refactor 2015-12-10 01:01:54 -05:00
Fox McCloud 3151d84904 Merge pull request #2783 from Crazylemon64/all_sheet_related_puns_i_can_think_of_are_vulgar
Improved Sheet Handling; Better Sci machine resource Formatting
2015-12-09 18:21:54 -05:00
Fox McCloud f6e7d30805 Merge pull request #2784 from Crazylemon64/robo_flash_and_console_tracking
Roboconsole gives loc and health, Drones now flash right
2015-12-09 17:45:58 -05:00
Crazylemon 5463a92828 Silly typo fix 2015-12-09 13:41:33 -08:00
Tigercat2000 42aa800393 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
Conflicts:
	code/game/supplyshuttle.dm
	code/modules/mining/laborcamp/laborshuttle.dm
2015-12-09 10:08:28 -08:00
Crazylemon ced3677f8b Removes the stack prompt for grabbing a single item from the stack
The prompt for transferring items between stacks, however, remains
2015-12-09 05:29:50 -08: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
Crazylemon64 289d54661c Roboconsole gives loc and health, Drones now flash right
- Adds health and location readings to the robot control console

- Drones now update status effects, so that flashes don't last forever
2015-12-08 14:29:56 -08:00
Crazylemon64 7efa8ed13f Sheet handling is much nicer now
- Nanotrasen fabrication machinery, such as those for space pods and
  exosuits, now have functional ID locks for their respective departments

- Research machinery and the fabricators now allow you to eject a custom
  amount of sheets, so you don't have to spam-click

- Splitting sheets by hand is now done by prompt
2015-12-08 14:23:48 -08:00
Crazylemon 97f2f91843 Adds handiness to stack ejection
Also should make the mech fabricator actually require robotics access as
the file would suggest. Here goes nothing
2015-12-08 10:47:32 -08: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
Certh fc3d211aa2 Fixes issues with two handed weapon sprites 2015-12-06 17:15:27 +01: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
Tigercat2000 c3f476f62c Supply shuttle, initial_move() fixes, dock fixes
Supply has been almost completely replaced by -tg-'s system.

No fancy UI, unfortunately, but modifying bay's directly was not possible.
2015-12-04 21:48:40 -08:00
ZomgPonies 62f4f5cf66 Revolver stuff 2015-12-03 23:18:03 -05:00
TheDZD 07021e506b Merge pull request #2699 from Fox-McCloud/botany-qol
Botany QoL Changes
2015-12-02 19:15:17 -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 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 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