Commit Graph

193 Commits

Author SHA1 Message Date
TheDZD 3e45999b32 Merge pull request #4624 from monster860/nanoui
Makes RnD console use NanoUI
2016-06-19 13:37:07 -04:00
monster860 14c340001a Desnowflakizing 2016-06-16 11:01:25 -04:00
monster860 a31c87e2e0 Makes RnD console use NanoUI 2016-06-08 21:14:14 -04:00
Fox McCloud 3594337638 Merge pull request #4558 from monster860/cluwne_voice
Adds comical implants
2016-06-07 09:31:02 -04:00
monster860 073aad1211 lein nutes 2016-06-01 18:11:52 -04:00
monster860 9d3a6fc979 Comical implants 2016-06-01 16:43:36 -04:00
IK3I 0dce120cf6 Implements Code Suggestions 2016-05-26 02:39:32 -05:00
IK3I ec9bc0ac2f Merge remote-tracking branch 'upstream/master' into Pod-Refactor 2016-05-23 14:59:23 -05:00
Fox McCloud 0d273521ce Merge pull request #4432 from monster860/floorpainter
Adds the floor painter
2016-05-22 18:43:15 -04:00
IK3I c7eb997a5a Fixes some items not being craftable 2016-05-17 01:37:21 -05:00
monster860 be6c65efc3 adds it to rnd 2016-05-14 18:10:08 -04:00
monster860 bbe031044f Adds the floor painter 2016-05-14 14:50:53 -04:00
IK3I b3169f18ea Cargo and Occupant Refactor with some cleaning
Various code optimizations and bug fixes
New cargo systems to make storage useful and test with
Secondary cargo system is now the slot that your chair or loot box can
go in
2016-05-11 18:20:04 -05: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
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
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
Matt f6808794aa Makes gameboard circuits printable
Whoops!
2016-04-26 16:19:30 +02: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
Fox-McCloud 4609413c7e Adds some Hydro Items to Autolathe and R&D 2016-04-12 03:58:53 -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
FalseIncarnate 40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -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 035b11a1b6 Robotics Sterile Surgery 2016-03-25 14:07:34 -04:00
Tastyfish f62209028b Adds video cameras to autolathe 2016-03-20 11:30:37 -04:00
Fox-McCloud 08c06782ee Can Make Cable Coils in Autolathes 2016-03-15 22:40:49 -04:00
Tastyfish c3de0cf196 Removes picture frames 2016-03-14 04:35:35 -04:00
Fox McCloud ee67a63aca Merge pull request #3841 from Crazylemon64/decloner_re_add
Makes the decloner possible to create again
2016-03-12 05:40:49 -05:00
TheDZD bdf26d9910 Merge pull request #3832 from monster860/fuckyougit
Spesspod Mining Laser - "Fuck You Git" edition
2016-03-11 21:27:53 -05:00
monster860 f6ccfc9ae7 Merge branch 'master' into fuckyougit 2016-03-11 06:17:16 -05:00
Crazylemon64 bd2b5f11b6 Makes the decloner possible to create again 2016-03-10 23:27:50 -08:00
FalseIncarnate 474dbb6b82 Buildable Xenobotany Machines
A long-requested feature, you can now build the two xenobotany machines
- Lysis-Isolation Centrifuge
- Requires 1 matter bin, 1 scanning module, and 1 console screen
- Upgrading the scanning module causes less degradation when extracting
genes, meaning seeds last longer
- Bioballistic Delivery System
- Requires 1 matter bin, 1 manipulator, and 1 console screen
- Upgrading the manipulator decreases the degradation caused by splicing
genes, meaning you can (theoretically) splice more onto a pack before it
fails
2016-03-10 21:46:07 -05:00
monster860 f4191293eb Spesspod Mining Laser - Fuck You Git edition 2016-03-10 21:24:21 -05:00
TheDZD c00b89e2af Merge pull request #3805 from Fox-McCloud/science-nerf
Heavily Rebalances Science
2016-03-10 19:16:38 -05:00
TheDZD 39335b9322 Merge pull request #3808 from Fox-McCloud/fixes
Organ Related Fixes
2016-03-09 17:01:50 -05:00
Fox-McCloud bcb0496578 Organ Related Fixes 2016-03-09 05:41:42 -05:00
Fox-McCloud 3ac2f23377 Heavily Rebalances Science 2016-03-09 02:58:05 -05:00
TheDZD 4e47626af7 Merge pull request #3767 from Tastyfish/silence
Tranquillité, Prospérité & Mimeré
2016-03-08 19:32:29 -05:00
Tastyfish d189d70f4a Adds tranquillite
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
2016-03-06 01:49:30 -05:00
Fox McCloud ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
FalseIncarnate a4b1f361a5 Buildable Prize Counter Boards and Non-silent Rocks
Fixes Prize Counter circuit boards not being listed in the circuit
imprinter despite having the required research levels

Fixes #3694
2016-02-25 22:44:21 -05:00
Aurorablade 9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Fox McCloud 433dde874a Merge pull request #3668 from Tastyfish/frames
Adds picture frames
2016-02-24 02:02:42 -05:00