Commit Graph

813 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
TheDZD
76ff7b48a3 Merge pull request #4633 from monster860/rnd-speed
Makes stock parts build 5x faster
2016-06-16 11:31:19 -04:00
monster860
14c340001a Desnowflakizing 2016-06-16 11:01:25 -04:00
Kyep
50afa5b6a6 Clarified sentience potion message (#4646) 2016-06-13 23:11:17 -04:00
monster860
c814156ca8 Makes stock parts build 5x faster 2016-06-10 16:22:26 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again
Major Gun Refactor
2016-06-08 22:49:10 -04:00
monster860
18a49a4817 Adds a bit of width to the console 2016-06-08 21:22:24 -04:00
monster860
a31c87e2e0 Makes RnD console use NanoUI 2016-06-08 21:14:14 -04:00
TheDZD
16f4b61520 Merge pull request #4613 from Fox-McCloud/experimentssss
Experimentor Duplication Limit
2016-06-08 11:15:18 -04:00
Fox McCloud
3594337638 Merge pull request #4558 from monster860/cluwne_voice
Adds comical implants
2016-06-07 09:31:02 -04:00
Fox-McCloud
bb02bfa284 Experimentor Duplication Limit 2016-06-07 02:25:06 -04:00
Fox-McCloud
56b4eb72bf Fixes Experimentor Cold Critical Reaction 2016-06-05 22:24:24 -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
TheDZD
4facfcb5a4 More fixes and sprites 2016-05-31 22:51:14 -04:00
TheDZD
a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
TheDZD
20ad49f9f9 Merge pull request #4383 from IK3I/Pod-Refactor
[Ready for Review] Pod refactor and fixes
2016-05-31 20:48:05 -04:00
monster860
d171cedada Makes upgrading the experimentor acutally make it better. 2016-05-28 21:10:13 -04:00
monster860
afa8bc7321 fix experimentor clone mode 2016-05-28 09:19:14 -04:00
monster860
50ecd8c319 Fix criticalReaction 2016-05-28 09:19:07 -04:00
monster860
d1b5cfb99f Fixes grabbing Ian and Runtime when using roundstart experimentor 2016-05-28 09:18:56 -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
Fox McCloud
bcbeb3024d Merge pull request #4433 from monster860/permatele
Adds permanent teleporter
2016-05-17 22:26:18 -04:00
IK3I
c7eb997a5a Fixes some items not being craftable 2016-05-17 01:37:21 -05:00
Vivalas
2190c9ed34 Fixes #3993 2016-05-16 14:18:01 -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
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