Markolie
0db98340f8
Further welding tool updates
2015-09-16 01:37:07 +02:00
Tigercat2000
c562680098
Merge remote-tracking branch 'origin/master' into bay_examine
...
# Conflicts:
# code/game/objects/structures/displaycase.dm
2015-09-15 14:08:36 -07:00
Mark van Alphen
cbb2a16409
Merge pull request #2046 from Fox-McCloud/tech-shell-balance
...
Tech Shells: Silver Removal
2015-09-15 17:36:57 +02:00
Markolie
90f722d752
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
icons/mob/back.dmi
2015-09-15 04:18:27 +02:00
Fox-McCloud
6fd7350746
Merge pull request #2040 from Markolie/guns
...
Guns update
2015-09-14 22:11:33 -04:00
Tigercat2000
0603f73232
Bay12 examine overhaul.
...
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
Fox-McCloud
8faf18484c
Tech Shells: Silver Removal
2015-09-14 06:40:35 -04:00
Markolie
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
Markolie
aaeac981b9
Temperature gun update
2015-09-13 21:05:23 +02:00
Fox-McCloud
25c35343dc
materials-consitency
2015-09-12 16:22:39 -04:00
Fox-McCloud
54fc3d9aa2
fixes
2015-09-12 15:59:02 -04:00
Fox-McCloud
15fc8144e8
Protolathe Materials Refactor
2015-09-12 03:35:22 -04:00
Fox-McCloud
2e7dcf89f2
Fixes RD Console Var Warning
2015-09-09 23:35:07 -04:00
Fox-McCloud
5551b7aa56
ewwwww
2015-09-08 20:05:27 -04:00
Fox-McCloud
28bcd7e78b
R&D Update and Fix & Cargo Tweaks
2015-09-07 20:03:06 -04:00
TheDZD
0fdfae99ba
Merge pull request #1966 from Fox-McCloud/health-assembly
...
Health Assembly
2015-09-07 17:24:52 -04:00
Fox-McCloud
3250621552
Health Assembly
2015-09-06 02:19:44 -04:00
Fox-McCloud
2214a8b455
R&D Update: Implants and Autolathes
2015-09-05 23:57:22 -04:00
Fox-McCloud
64b2bb3784
Merge remote-tracking branch 'upstream/master' into material-datums
2015-09-04 22:53:20 -04:00
Fox-McCloud
fd8b4ca578
numbers fixes
2015-09-04 17:32:22 -04:00
Fox-McCloud
5bb851b771
Pass II
2015-09-04 16:32:18 -04:00
Fox-McCloud
a019934e9e
Pass I
2015-09-04 05:18:48 -04:00
Fox-McCloud
7c29e59784
Materialized Datums
2015-09-04 01:40:06 -04:00
Markolie
3a3457de36
Port Bay's intercom overhaul
2015-09-03 21:21:20 +02:00
Fox-McCloud
9695509908
Merge pull request #1919 from tigercat2000/funlittletgthings
...
Progress bars
2015-09-01 16:45:10 -04:00
Fox-McCloud
d829e7003a
Merge pull request #1913 from Markolie/lawmanager
...
Port Bay's silicon law manager
2015-09-01 16:41:55 -04:00
Tigercat2000
7f4ac72910
Progress bars + Wall Rationalization
...
This commit does the following:
- Ports progress bars from -tg- (tgstation/-tg-station#9921 )
- Refactors wall attackby code to make it 100% less insane; Instead of
manually checking every little thing, it uses do_after,
consequentially, making the new progress bars affect dealing with walls
as well.
Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
Markolie
b999ca32b8
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawmanager
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-08-31 02:23:24 +02:00
Markolie
5dc034719d
Port Bay's silicon law manager
2015-08-31 02:18:49 +02:00
Markolie
1cc4f7f483
Add syndicate stamp
2015-08-30 22:52:31 +02:00
TheDZD
a00b878779
Merge pull request #1856 from Fox-McCloud/rnd-lockboxes
...
R&D Lockbox Origintech
2015-08-26 22:05:56 -04:00
Fox-McCloud
52df4c6a33
Fixes Max Research Levels
2015-08-25 21:59:51 -04:00
Fox-McCloud
110abbda59
R&D Lockbox Origintech
2015-08-25 21:24:09 -04:00
Markolie
4cc6192783
Fix robotics console admin message
2015-08-25 19:31:38 +02:00
Fox-McCloud
fd01044d16
Merge pull request #1833 from Markolie/T34-IPC
...
IPC organs are now printable, shuttle console ghost access
2015-08-24 16:55:05 -04:00
Fox-McCloud
d2396dc725
Emitter Fix
2015-08-24 02:26:50 -04:00
Fox-McCloud
0bd980b6d1
Producible Emitter Boards
2015-08-23 15:54:51 -04:00
Markolie
1a16f807e0
Let robotics print IPC organs
2015-08-23 21:05:38 +02:00
Fox-McCloud
a53451c243
Merge pull request #1813 from TheDZD/muhcheens
...
Machine Upgrade Update
2015-08-23 00:35:18 -04:00
DZD
9f6cc85d7a
Bug fixes
...
- Fixes not being able to put multiple items into a processor.
- Fixes monkey recycler design having the same ID as the smartfridge.
2015-08-22 14:02:41 -04:00
DZD
32c849a1d5
More buildables, some fixes, upgradable smartfridge
...
- Fuel is now available in the tier 4 reagent list for buildable chem
dispensers.
- Seed extractor, gibber, and recycler can be built, but having better
stock parts has no effect.
- Smartfridge can hold up to 1500 items by default instead of 999,
upgrading matter bin allows it to hold more.
2015-08-21 20:06:23 -04:00
Mark van Alphen
f70f75704d
Merge pull request #1796 from Fox-McCloud/detective-scanner
...
Detective Scanner Protolathe Production
2015-08-21 17:19:06 +02:00
DZD
5ce49bb3b3
Machine Upgrade Update
...
- Partial port of tgstation/-tg-station#9813
2015-08-20 21:03:19 -04:00
Markolie
87570fc080
isNonCrewAntag() checks, key_name fixes
2015-08-20 17:25:55 +02:00
Fox-McCloud
d623c97741
Detective Scanner Protolathe Production
2015-08-19 18:16:52 -04:00
Markolie
a397c730b5
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-16 23:28:02 +02:00
TheDZD
625813286c
Merge pull request #1699 from Markolie/rndserver
...
Fix RnD server deconstruction
2015-08-10 10:54:08 -04:00
Markolie
627c50c76b
Fix RnD server deconstruction
2015-08-10 16:20:56 +02:00
TheDZD
aadd7a4d9e
Merge pull request #1675 from Fox-McCloud/welding-gas
...
Adds in Welding Gas Mask
2015-08-09 19:31:53 -04:00
Fox-McCloud
170ef64412
Adds in Welding Gas Mask
2015-08-08 16:17:11 -04:00
