Commit Graph

5319 Commits

Author SHA1 Message Date
TheDZD
8ad5e18757 Merge pull request #4112 from Fox-McCloud/xenobio-overhaul
Xenobio Refactor/Changes
2016-04-07 17:54:33 -04:00
Tastyfish
85a58e59a6 Fixes to_chat script fuckery 2016-04-06 20:41:45 -04:00
Fox-McCloud
3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -04:00
Tigercat2000
dd79aaa967 Merge remote-tracking branch 'upstream/master' into to_chat
Conflicts:
	code/game/machinery/door_control.dm
2016-04-05 21:10:36 -07:00
FalseIncarnate
8a558a7c96 Merge Conflict 2016-04-05 19:26:30 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07:00
FalseIncarnate
40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Fox-McCloud
b3b0abd95b Fixes Weakeyes 2016-04-03 01:19:49 -04:00
Fox McCloud
752d106bef Merge pull request #4067 from tigercat2000/510staging
Merge branch 'byond510' into master
2016-04-02 22:44:00 -04:00
Fox McCloud
817b7928eb Merge pull request #4058 from FalseIncarnate/reagents
Reagent Container Tweaks
2016-04-02 04:12:23 -04:00
Tigercat2000
7a41efd1da Last staging fixes 2016-04-01 16:09:43 -07:00
Tigercat2000
519992b5a9 Merge branch 'byond510'
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
2016-04-01 14:15:44 -07:00
FalseIncarnate
777f8cbfb6 Beaker and Pill Bottle Labeling
Can now label Pill Bottles with pens, just like Beakers

Beakers (and pill bottles) can now accept 26 character labels from pens.
2016-04-01 15:17:47 -04:00
Fox McCloud
80ae4bff80 Merge pull request #4045 from ProperPants/Cyborg_Stacks
Cleaning and Definition of Cyborg Stacks
2016-03-31 22:24:19 -04:00
Tastyfish
6a8ea815b2 Merge branch 'master' into buttbots2
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
2016-03-31 13:33:46 -04:00
ProperPants
0f9797a7c2 Cyborg wood is gone. I don't know why it was there in the first place. 2016-03-31 08:18:39 -04:00
ProperPants
b764f18840 I forgot to change the cyborg modules back to normal for the tiles. 2016-03-30 22:16:09 -04:00
ProperPants
2b4456c12f Cleaned up some cyborg stacks to take almost everything from the parent. 2016-03-30 22:13:28 -04:00
ProperPants
065f3c8a9d Removed the tiles because apparently they're pointless. 2016-03-30 21:32:41 -04:00
Fox McCloud
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1
-tg- disease1
2016-03-30 21:29:58 -04:00
ProperPants
bca3c683e2 Cyborg versions of stacks that didn't already have them. Increased cyborg starting rods to one full stack (60 rods). 2016-03-30 20:55:57 -04:00
TheDZD
cc6e89ace8 Merge pull request #4030 from Fox-McCloud/advanced-camera-port
Ports Advanced Cameras
2016-03-30 18:48:16 -04:00
Fox McCloud
ec9a7a486d Merge pull request #3927 from Crazylemon64/metal_foam_space_flooring
Metal foam walls will now also produce plating on space tiles
2016-03-30 16:26:56 -04:00
Fox McCloud
0f8085e1d8 Merge pull request #3980 from Aurorablade/ArtsAndCrafts
Fethas Carnival of Horrors:Rusty Iron Chef
2016-03-30 16:25:27 -04:00
ProperPants
15946be225 Operating tables can now be destroyed with a wrench. They give back as much plasteel as they cost to allow them to be moved. Trimmed dumb description for metal sheets. 2016-03-29 19:50:38 -04:00
Fox-McCloud
6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
FalseIncarnate
1caf39230a Logic Gates WIP 3
Allows mass driver buttons to send logic signals
- They send LOGIC_FLICKER, since they are only on when pressed, then
turn off when released
- Can send logic signals to a different ID tag than their associated
driver/door ID tag, configurable from the multitool menu

Allows light switches to send logic signals
- Will send LOGIC_ON or LOGIC_OFF signals to match their current state
- Send both when toggled and on the process() cycle
- Light control can be toggled via the multitool menu, so you can use
them as purely light switches, purely logic switches, or as dual
switches

Allows light switches to be made from metal sheets, just like mass
driver buttons (1 sheet per button)
- Fixes a resource duplication bug where driver buttons can be
disassembled for more metal than it takes to build them

Begins to move some code for various button types into the buttons.dm
file, rather than being scattered across multiple files
- Driver buttons code moved from door_control.dm
- Ignition switch code moved from igniter.dm

Renames driver_button.dm to buttons_switches.dm
- This is the file that contained the mountable frames for driver
buttons, and now also contains the frame for light switches.
2016-03-29 03:11:42 -04:00
Crazylemon64
7aa519723b Merge branch 'master' of https://github.com/Crazylemon64/Paradise into metal_foam_space_flooring 2016-03-28 23:13:43 -07:00
Crazylemon64
00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Fox McCloud
65eab3d8c8 Merge pull request #4017 from ProperPants/WorkingBranch
Additions to Engineering Cyborg and Maintenance Drones
2016-03-29 00:17:23 -04:00
ProperPants
c1affcd02b Cyborg versions of some stuff.
Added a line in some commentary that should have been there, but wasn't.
2016-03-28 23:36:03 -04:00
ProperPants
cff2b62736 Deleted a blank line and some unused code that I came across.
Tigercat2000 gave me permission.
2016-03-28 22:51:27 -04:00
ProperPants
937a4c7479 Forgot something else 2016-03-28 22:42:12 -04:00
ProperPants
b5c073e58b Removes plasteel from drones and borgs. 2016-03-28 21:32:46 -04:00
ProperPants
f8f132d2f1 Should make robots unable to build anything out of plasteel and only plasteel. Here's hoping. 2016-03-28 17:06:38 -04:00
Tastyfish
08da2260a0 Ports tg's smooth progress bars 2016-03-28 04:24:26 -04:00
Tigercat2000
ad2cf86898 -tg- disease1
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)

Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!

Changes:
 - Virus2 has been removed completely.
  - Some symptoms have not been readded. Aka, none of them have been
    readded, I just wanted to get this shit ported.
  - Virology has been updated slightly to mirror -tg-'s boxstation, as the
    virus2 machines are gone.
 - Welcome back, disease1
  - The centrifuge, vials, splicer, analyzer, growerthing, have all been
    replaced by the PanD.E.M.I.C. 2220
  - No symptoms have been completely removed; However, vision symptoms
    have been disabled pending byond 510, and genetics symptoms have been
    disabled until "when I figure out how to fix them".
  - Advanced Mutation Toxin now uses a disease, which turns people from
    species, to slime person, to slime. Slime people are instantly turned
    to a slime.
  - Diseased touch now give people appendicitis. Yes, they VANT YOUR...
    appendix.
  - Virology now has a fridge with the following in it:
    - Antiviral Syringes
    - 1 Rhinovirus culture
    - 1 Flu culture
    - 1 Bottle of Mutagen
    - 1 Bottle of Plasma
    - 1 Bottle of Synaptizine
  - A few more things, which I can't remember and can't look at while writing
    this commit. Sometimes, git hurts.

TODO:
 - Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
   work.
 - Fix genetics symptoms.
 - Give vampires a less shitty diseased touch.
 - Add appendicitis event.
 -
2016-03-27 21:24:00 -07:00
Tastyfish
25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
ProperPants
f928b62492 Surprise commit. Fixed my borking of engi borg reduced cable coil. Removed plasteel from engi borg. Formatting fixes. 2016-03-27 23:23:38 -04:00
ProperPants
f79d33d47b This should add magboots and plasteel to maintenance drones. This should also add plasteel to engineers, and make synthetics capable of using plasteel. 2016-03-27 21:26:45 -04:00
Tastyfish
fe7fbbeb9f Allows voice activators, etc to work in storage items 2016-03-25 20:13:18 -04:00
Fox McCloud
aac7986622 Merge pull request #3972 from FlattestGuitar/confetti_2_sigh
Adds party grenades
2016-03-24 13:03:34 -04:00
Aurorablade
40a1086f14 butchering is still broke.... 2016-03-24 00:07:41 -04:00
Mieszko Jędrzejczak
3b514ddacb Things 2016-03-23 22:42:30 +01:00
Aurorablade
db887489d3 tiggersgonnaeatme 2016-03-23 17:31:29 -04:00
Mieszko Jędrzejczak
135687fe7e Adds party grenades 2016-03-23 12:11:39 +01:00
Fox McCloud
fb7cb2cf65 Merge pull request #3944 from DaveTheHeadcrab/hitmanTators
Adds Fiber Wire
2016-03-22 21:01:07 -04:00
SamCroswell
3d22908221 Stun Value Adjustments 2016-03-21 23:07:19 -04:00