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
Fox-McCloud
3aa9563f2b
Merge pull request #2049 from Markolie/display
...
Display case update
2015-09-15 16:02:43 -04:00
Markolie
0db5d89354
Notice --> Danger
2015-09-15 18:48:58 +02:00
Markolie
e64ac23677
Further display case improvements
2015-09-15 18:47:19 +02: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
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
Markolie
59b78376e9
Display case update, some forceMove updates
2015-09-14 20:21:56 +02:00
Mark van Alphen
b7b07c95ba
Merge pull request #2024 from Fox-McCloud/racks
...
Table Rack Destruction
2015-09-14 18:43:43 +02:00
Fox-McCloud
1e1c667ad5
Backpack Storage Rework
2015-09-13 23:22:09 -04:00
Markolie
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
Markolie
2cf27f9255
Get rid of two obsolete overrides
2015-09-13 23:03:16 +02:00
Markolie
2b23ba0048
In-hands can now be any size
2015-09-13 23:00:31 +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
f68518e3c1
Table Rack Destruction
2015-09-13 01:59:13 -04: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
Mark van Alphen
e499554fef
Merge pull request #1984 from Fox-McCloud/mining-voucher
...
Adds Mining Voucher to QM's locker
2015-09-10 01:13:58 +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
Fox-McCloud
1d7ecf48ff
Adds Mining Voucher to QM's locker
2015-09-08 12:53:57 -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
TheDZD
ec3113f44b
Merge pull request #1964 from Fox-McCloud/rnd-update
...
R&D Update: Implants and Autolathes
2015-09-07 17:20:44 -04:00
Mark van Alphen
6c1208e18f
Merge pull request #1819 from Aurorablade/GoOnYourFeet
...
[Sprite] [TG Port] Things that go on your feet
2015-09-07 22:31:21 +02: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
e20fedaec1
Merge pull request #1957 from tigercat2000/tg_xeno_tweaks
...
Misc. -tg- xeno tweaks
2015-09-06 16:48:15 -04:00
Fox-McCloud
2214a8b455
R&D Update: Implants and Autolathes
2015-09-05 23:57:22 -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
