Regen
3d1dcbc4d5
Merge remote-tracking branch 'ParadiseSS13/master' into mechweapons
2015-09-06 22:56:35 +02:00
Regen
c4e0f4ad3b
Lockbox update
...
Makes it so the mech weapons actually do spawn in lockboxes
Also adds a large lockbox to fit the mech weapons (No sprite as of yet)
2015-09-06 22:55:22 +02:00
Fox-McCloud
e20fedaec1
Merge pull request #1957 from tigercat2000/tg_xeno_tweaks
...
Misc. -tg- xeno tweaks
2015-09-06 16:48:15 -04:00
TheDZD
fe2a3ef960
Merge pull request #1954 from Fox-McCloud/material-datums
...
Material datums, Recycler Refactor, and Additional Item Materials
2015-09-05 19:36:15 -04:00
Tigercat2000
54d2fa8c84
Misc. -tg- xeno tweaks
...
This commit does the following:
- Allows xenomorphs to mine through mineral turfs (the asteroid)
- Changes weed spreading to use atmos procs; It will spread like gas, not
just checking "oh, dense object, no pass for me!"
- No, this doesn't mean it will spread infinitely or quicker, just
changes where it can spread.
2015-09-05 08:34:08 -07:00
Fox-McCloud
6f53ca4b4e
Merge pull request #1953 from KasparoVy/master
...
Adds Vox Security Uniforms + Warden/HoS Corporate Uni. to Their Lockers
2015-09-05 05:55:50 -04:00
Fox-McCloud
95cea49702
oops
2015-09-04 22:56:52 -04:00
Fox-McCloud
64b2bb3784
Merge remote-tracking branch 'upstream/master' into material-datums
2015-09-04 22:53:20 -04:00
Fox-McCloud
e8f486f397
Merge pull request #1946 from Markolie/intercom
...
Remove radio free range
2015-09-04 22:47:24 -04:00
TheDZD
07acac3bfd
Merge pull request #1944 from Fox-McCloud/cult-tweaks
...
Cult Tweaks
2015-09-04 22:01:11 -04:00
Markolie
94bb785282
Final intercom fixes
2015-09-05 02:42:19 +02:00
Markolie
368124a7e6
Main map intercom updates
2015-09-05 02:27:20 +02:00
Fox-McCloud
ea6bfdf758
upgradeable recycler
2015-09-04 19:41:42 -04:00
Markolie
281f5a9640
Intercom update
2015-09-05 01:38:34 +02:00
Fox-McCloud
71493c9d3f
butchers knife oops
2015-09-04 18:37:47 -04:00
Fox-McCloud
46ce41fbc8
unused var axing
2015-09-04 18:04:34 -04:00
KasparoVy
f3ba11fbda
Adds Warden Corporate and HoS Corporate Uniforms to Appropriate Lockers
2015-09-04 15:49:27 -04:00
Markolie
26d0ad3071
Radio access update
2015-09-04 19:29:56 +02: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
9b8342897e
Cult Tweaks
2015-09-02 21:08:08 -04:00
Fox-McCloud
e2347866a8
Merge pull request #1926 from Markolie/lordoftheflies
...
Make lockers use forceMove()
2015-09-02 15:58:09 -04: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
Fox-McCloud
2b6e574587
Merge pull request #1891 from Markolie/eyes
...
Mechanicals eyes update
2015-09-01 16:41:42 -04:00
Markolie
2f96d6e3a6
Update comment
2015-09-01 19:16:11 +02:00
Markolie
3898ba87a7
Robotic eyes will not protect your from welding/the supermatter
2015-09-01 19:13:17 +02:00
Markolie
8d7bd64a00
Make lockers use forceMove()
2015-09-01 18:49:19 +02:00
Fox-McCloud
0b3f784acc
Merge pull request #1912 from tigercat2000/xenies
...
Remove arbitrary w_class restriction for xenos
2015-08-31 21:32:31 -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
Fox-McCloud
b683cfa0c5
Merge pull request #1898 from Markolie/wheelchair
...
Allow for the construction of wheel chairs
2015-08-30 19:47:25 -04:00
Tigercat2000
b1f0fc4560
Remove arbitrary w_class restriction for xenos
2015-08-30 15:32:51 -07:00
Markolie
29d91a7995
Allow for the construction of wheel chairs
2015-08-30 01:08:40 +02:00
Markolie
182e546d6a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-08-30 00:38:03 +02:00
Fox-McCloud
67f1b00291
Transit Tube Update
2015-08-29 18:22:29 -04:00
Mark van Alphen
7aabf8b79e
Merge pull request #1873 from tigercat2000/centcomm
...
Centcom tweaks
2015-08-29 19:03:59 +02:00
Markolie
134d2116c6
Makes mechanical eyes protect you
2015-08-29 18:38:26 +02:00
Markolie
59632e1897
Add new variable instead of using blocked
2015-08-29 03:25:35 +02:00
Markolie
de03689105
Fix DNA injector radiation damage
2015-08-29 01:28:47 +02:00
Fox-McCloud
d70b644621
Merge pull request #1876 from Markolie/magpulse
...
Give engineering borgs a permanent magboots effect
2015-08-28 18:42:23 -04:00
Fox-McCloud
8034b35881
Merge pull request #1869 from Markolie/fuckingglass
...
Ghost interaction update, voice changer fix, man up global confirmation
2015-08-28 14:36:16 -04:00
Markolie
f8e462b1ee
Give engineering borgs magboots
2015-08-27 23:59:47 +02:00
Tigercat2000
a54be7c47b
Centcomm Mods
...
Moved the kitchen and dorms to be sticking out less
Added escape bathrooms
2015-08-27 12:59:37 -07:00
Markolie
0e0cc0af50
Ghost interaction update, voice changer fix, man up global confirmation
2015-08-27 15:33:33 +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
Markolie
27f75d7b38
Fix ghosts triggering glass
2015-08-27 03:25:32 +02:00
Fox-McCloud
110abbda59
R&D Lockbox Origintech
2015-08-25 21:24:09 -04:00
