Fox-McCloud
4e9befc310
Tweaks
2015-09-21 00:25:27 -04:00
Fox-McCloud
bd3696523b
GC a few Datums
2015-09-20 22:40:13 -04:00
Markolie
c5c64413a1
Pipenet overhaul
2015-09-21 02:11:54 +02:00
Fox-McCloud
263c67ea2e
tweak
2015-09-20 17:26:01 -04:00
Fox-McCloud
72e14e59da
RCS Update and Tweaks
2015-09-20 03:09:18 -04:00
Fox-McCloud
2d52bd90e1
Syndicate Ship Update
2015-09-17 08:22:50 -04: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
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
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
Markolie
f41f0a59fe
Guns update
2015-09-14 04:05:20 +02:00
Fox-McCloud
f68518e3c1
Table Rack Destruction
2015-09-13 01:59:13 -04: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
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
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
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
KasparoVy
f3ba11fbda
Adds Warden Corporate and HoS Corporate Uniforms to Appropriate Lockers
2015-09-04 15:49:27 -04:00
Fox-McCloud
e2347866a8
Merge pull request #1926 from Markolie/lordoftheflies
...
Make lockers use forceMove()
2015-09-02 15:58:09 -04:00
Markolie
8d7bd64a00
Make lockers use forceMove()
2015-09-01 18:49:19 +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
Aurorablade
0f1a44eb2e
Merge remote-tracking branch 'ParadiseSS13/master' into GoOnYourFeet
2015-08-29 20:12:41 -04:00
Fox-McCloud
67f1b00291
Transit Tube Update
2015-08-29 18:22:29 -04: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
Aurorablade
ac6a2baa80
Sock port
...
Plus fix to secruity records text
2015-08-21 17:43:16 -04:00
Fox-McCloud
333e7fe236
Merge pull request #1766 from Markolie/adminbus
...
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-17 18:10:38 -04:00
Markolie
8af3c8c47a
Final fixes/mech attack update
2015-08-17 00:32:50 +02:00
Markolie
5eee617063
Consolidate ?/FLW links under key_name_admin
2015-08-17 00:13:53 +02:00
Markolie
a397c730b5
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-16 23:28:02 +02:00
Tigercat2000
748da30bb6
-tg- underware overhaul
...
This commit overhauls the underwear/undershirt system to -tg-'s text-based
version. No more magic numbers, just text states.
Note, this modifies the SQL Schema, and existing databases must be
modified by the following SQL:
ALTER TABLE server_db.characters
CHANGE underwear underwear MEDIUMTEXT NOT NULL,
CHANGE undershirt undershirt MEDIUMTEXT NOT NULL;
2015-08-13 17:45:52 -07:00
Markolie
bc424946c4
Add attack delay to alien nests
2015-08-09 17:27:02 +02:00
TheDZD
13689db0ef
Merge pull request #1652 from Fox-McCloud/fox-is-evil
...
Ports over Airhorns
2015-08-07 17:56:14 -04:00
Fox-McCloud
c3ad070066
Ports over Airhorns
2015-08-06 00:42:17 -04:00
Fox-McCloud
78950ec682
tweak 2.0
2015-08-05 20:12:11 -04:00
Fox-McCloud
e8ece032c9
Merge pull request #1635 from tigercat2000/plaintextisbadsometimes
...
Replace (TM) in mirror title with actual TM character
2015-08-03 21:25:33 -04:00
Tigercat2000
b8be8cb4ca
Replace (TM) in mirror title with actual TM character)
2015-08-03 14:53:28 -07:00
Fox-McCloud
82f62da60f
Merge pull request #1604 from TheDZD/helper
...
Subtypesof Helper Proc
2015-08-03 17:44:01 -04:00
DZD
d9bb30f47a
Replaces typesof with subtypesof where applicable
2015-08-03 11:04:28 -04:00
Markolie
e35431da34
Port Bay's appearance changer
2015-08-01 23:22:20 +02:00
DZD
ba82f03d7c
Drill and drone fixes
...
- Fixes mining drones having access to a plasma cutter energy weapon,
replaced with a diamond drill. Functionality is almost identical to what
it was with old plasma cutters.
- Pathing fixes for diamond drills.
2015-08-01 10:13:54 -04:00
Fox-McCloud
ab083aff50
Mining Fixes
2015-07-30 17:01:59 -04:00
Fox-McCloud
1ee7853d65
Merge pull request #1476 from TheDZD/mining2
...
Mining Overhaul [Soon™]
2015-07-29 20:51:24 -04:00
Fox-McCloud
eb694a50eb
Updates Nuke Disk Spawning
2015-07-24 17:33:25 -04:00
DZD
29e70854e9
Fix merge conflicts
...
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
Krausus
8e753ac1a6
Removes redundant timestamp
2015-07-14 04:18:35 -04:00
