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
1539a4d1e8
Merge pull request #2041 from Fox-McCloud/backpacks
...
Backpack Storage Rework
2015-09-15 06:58:44 +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
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
1e1c667ad5
Backpack Storage Rework
2015-09-13 23:22:09 -04:00
Markolie
2cf27f9255
Get rid of two obsolete overrides
2015-09-13 23:03:16 +02:00
Markolie
ca6c7d10ba
In hand sprite overhaul
2015-09-13 22:44:18 +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
Markolie
d5a3fb57ea
Add cooldown to pAI card/drone reactivations
2015-09-11 06:51:14 +02:00
Mark van Alphen
84b42c5491
Merge pull request #1986 from Fox-McCloud/nuke-and-tator
...
Nuke Ops and Traitor Update+Balance
2015-09-10 02:24:32 +02:00
Mark van Alphen
69139c1bef
Merge pull request #1993 from Fox-McCloud/rad-laser-fix
...
Rad Laser Fix
2015-09-10 01:14:38 +02:00
Fox-McCloud
5b160f78f4
topic-fixup
2015-09-09 17:49:27 -04:00
Fox-McCloud
d70c166109
Rad Laser Fix
2015-09-09 17:00:53 -04:00
Fox-McCloud
71f6b312d8
tweak
2015-09-08 22:01:05 -04:00
Fox-McCloud
1c6c733a52
Nuke Ops and Traitor Update+Balance
2015-09-08 19:38:30 -04:00
Tigercat2000
ee32c0a35a
Merge branch 'master' into intent_define
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2015-09-08 04:43:13 -07:00
Tigercat2000
be92665871
Replace magic intent words with defines, grab fixes
...
This commit does the following:
- Replaces all instances of magic intent words, like "harm" and
"help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM
- Fixes a few manual grab instances left over in attack_alien, they
will now used grabbedby()
2015-09-07 11:51:00 -07:00
Fox-McCloud
2214a8b455
R&D Update: Implants and Autolathes
2015-09-05 23:57:22 -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
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
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
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
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
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
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
