Commit Graph

783 Commits

Author SHA1 Message Date
TheDZD 85a583f126 Merge pull request #4287 from Fox-McCloud/science-update-II
Science Rebalance Round II
2016-05-08 13:02:04 -04:00
Fox McCloud c8e94bb7af Merge pull request #4301 from IK3I/master
Adds Pod Locks
2016-05-05 21:39:19 -04:00
TheDZD 9a4c1125e0 Merge pull request #4343 from Fox-McCloud/accelerator-cannon
Ports Accelerator Laser Cannon
2016-05-05 21:22:08 -04:00
Fox-McCloud 2328ff2be5 Tesla Gun Implementation and Small R&D Change 2016-05-04 17:13:28 -04:00
Fox-McCloud c3c3ad2602 Ports Accelerator Laser Cannon 2016-05-02 23:50:38 -04:00
Fox-McCloud 2d90585ecc Makes Explosion and Singulo Defer Based on CPU 2016-04-30 05:17:45 -04:00
Fox-McCloud f543a60e30 circuit imprinter 2016-04-29 08:47:23 -04:00
IK3I ad5c5dca39 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
2016-04-27 18:20:50 -05:00
TheDZD a820ef101f Merge pull request #4296 from CrAzYPiLoT-SS13/chess_print
Makes gameboard circuits printable
2016-04-27 18:50:34 -04:00
Fox McCloud 110958860b Merge pull request #4270 from FlattestGuitar/foamforce
Ports /tg/ FOAM FORCE
2016-04-27 11:43:55 -04:00
IK3I 7ea9dd2a36 Adds Pod Locks
Adds key and tumbler based pod locks
Adds lock pod system
Adds pod lock to sec pod
Adds keys to sec pod in HoS and Pilot Offices
2016-04-27 04:18:11 -05:00
TheDZD ddc459d92a Merge pull request #4189 from Fox-McCloud/xenobio-additions
Xenobio Addition
2016-04-26 20:23:49 -04:00
Fox-McCloud d5fb23d4d7 no fun crew has arrived 2016-04-26 20:12:31 -04:00
Matt f6808794aa Makes gameboard circuits printable
Whoops!
2016-04-26 16:19:30 +02:00
Fox-McCloud b4469854bf re-add circuit imprinter efficiency 2016-04-26 03:16:00 -04:00
Fox-McCloud d546d4efd8 Science Rebalance Round II 2016-04-25 04:07:49 -04:00
Mieszko Jędrzejczak 03c173aeaf Lowers costs, adds darts to autolathe 2016-04-24 09:19:03 +02:00
Fox-McCloud 2954aa88ea abductor tech 2016-04-18 19:17:46 -04:00
TheDZD 9cc5dbb812 Merge pull request #4176 from Fox-McCloud/hydroponics-items
Adds some Hydro Items to Autolathe and R&D
2016-04-14 19:13:47 -04:00
Fox-McCloud 81ed1467d7 Xenobio Additions 2016-04-13 01:50:11 -04:00
Fox-McCloud 4609413c7e Adds some Hydro Items to Autolathe and R&D 2016-04-12 03:58:53 -04:00
Fox-McCloud 5e1fa7f8e2 Mining Bot Updates 2016-04-10 22:15:36 -04:00
FalseIncarnate 397d71a3af Vendor Changes
Re-upload without the smoking pipe stuff.
2016-04-10 00:07:37 -04:00
FalseIncarnate 990c83c6bb Revert "Vendor and Pipe Changes"
This reverts commit d21168fb38.
2016-04-09 23:38:36 -04:00
FalseIncarnate d21168fb38 Vendor and Pipe Changes
Using a screwdriver on a vendor circuitboard now provides a nice list of machines to select from, rather than relying
on RNG to select them.

Vendor circuitboards have been moved from the Circuit imprinter to the Autolathe, and have had their costs tweaked accordingly
- Was 1000 glass and 20 sacid, now 750 glass and 250 metal
- This was because cargo is meant to be responsible for vending machines, and you had to get the supply containers from cargo ANYWAYS just to build a new one

Pipes, cigarettes, and joints can no longer be lit with a burnt match

Pipes and corncob pipes no longer can be refilled infinitely at whim
- A new item "pipe tobacco tin" has been added to the cigarette vendors, which can be used on an empty pipe to refill it 5 times before being consumed.
- Tobacco, Space Tobacco, Ambrosia Vulgaris, and Ambrosia Deus can be put directly into an empty pipe to fill it with that as an alternative

Pipes (the ones from the merch store computer) have had their volume reduced to 100, from 200 (that's still a lot of nicotine)

Corncob Pipes no longer come pre-filled, as that made no sense (normal pipes still come pre-filled, because you paid good money for that)
- They have also had their smoketime reduced to 400, from 800, so they don't last longer than purchased pipes
2016-04-08 02:51:04 -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
FalseIncarnate 40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -04:00
Tigercat2000 c72cc9606e Merge remote-tracking branch 'upstream/master' into to_chat
Conflicts:
	code/modules/research/xenobiology/xenobiology.dm
2016-04-05 15:54:48 -07:00
TheDZD 35f89251b3 Merge pull request #4100 from Fox-McCloud/sentience-potion-changes
Sentience Potion Changes
2016-04-05 18:37:57 -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 b7afdec18c defines 2016-04-04 17:01:03 -04:00
Fox-McCloud aee239c6e5 Sentience Potion Changes 2016-04-04 04:45:13 -04:00
Fox-McCloud 3bd37ec757 Simple Animal Spawn Refactor 2016-04-04 00:30:10 -04: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
Fox-McCloud 560eb17f9d Fully Re-Activates Disease1 2016-03-30 22:31:59 -04:00
Fox McCloud d1765e0e14 Merge pull request #4019 from tigercat2000/disease1
-tg- disease1
2016-03-30 21:29:58 -04:00
Fox-McCloud 9127c357e9 further thingssssssssssssssssssssssss 2016-03-30 18:17:55 -04:00
Tigercat2000 917dc9ab54 Add PanDEMIC design datum 2016-03-30 10:58:24 -07:00
FalseIncarnate b91740b19b Logic Gates
Adds CONVERT Gates, for converting a signaler signal to logic or
vice-versa.

Restructured/renamed some of the new logic files
- Split up the logic_gates.dm file into three files
- mono_input.dm
- dual_input.dm
- converter.dm

Made the logic_gate machines auto-update their multitool menu when you
click the links

Made the logic gate circuit boards a product of the autolathe
- Take that science. Quit hogging all the boards, nerds.

Removed relative pathing from signaler.dm
2016-03-30 02:21:10 -04:00
Fox-McCloud c345b8a761 forcemove 2016-03-29 21:36:58 -04:00
Fox-McCloud 6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
TheDZD 6c130db64b Merge pull request #3998 from Fox-McCloud/surgery-robotics
Robotics Sterile Surgery
2016-03-26 17:33:31 -04:00
Tastyfish 077395f606 Fixes Timestop 2016-03-26 08:37:50 -04:00
Fox-McCloud 035b11a1b6 Robotics Sterile Surgery 2016-03-25 14:07:34 -04:00
Fox McCloud c32025e682 Merge pull request #3937 from Tastyfish/videocam
Adds video cameras to autolathe
2016-03-21 21:02:54 -04:00
Tastyfish f62209028b Adds video cameras to autolathe 2016-03-20 11:30:37 -04:00
Fox-McCloud 42f494aa7e Design Transfer Blueprints Protolathe->Autolathe 2016-03-20 03:53:11 -04:00