Fox-McCloud
96030a706a
Merge pull request #2069 from Markolie/computor
...
Reduce computer lights, air alarm fix
2015-09-16 20:05:48 -04:00
Fox-McCloud
bef21a964d
Merge pull request #2068 from Markolie/lawstate
...
Welding tool refactor, in-hand updates
2015-09-16 19:07:29 -04:00
Mark van Alphen
02921fea74
Merge pull request #1971 from Regen1/mechweapons
...
Mech weapons spawn in lockboxes framework
2015-09-16 21:17:27 +02:00
Mark van Alphen
feff96184a
Merge pull request #2061 from Fox-McCloud/handbiting
...
Removes Handchewing While Cuffed
2015-09-16 20:23:14 +02:00
Mark van Alphen
8625c7f8f0
Merge pull request #2060 from Fox-McCloud/ore-materials
...
Adds Materials to Ore
2015-09-16 20:22:54 +02:00
Mark van Alphen
d708ee8d84
Merge pull request #2058 from Fox-McCloud/cluster-grenade-cleanup
...
Cluster Grenade Cleanup
2015-09-16 20:22:38 +02:00
Fox-McCloud
8061dbf7c3
Merge pull request #2059 from Ultimate-Chimera/master
...
Adds a toxins and burn medkit to the mining outpost and adds in a xenomorph toy! (Take 2)
2015-09-16 08:33:05 -04:00
Fox-McCloud
311cd79e5c
More Grenades
2015-09-16 00:00:07 -04:00
Fox-McCloud
9ca7d1002d
one last grenade
2015-09-15 21:48:53 -04:00
Markolie
5564f3da5b
Add missing variables
2015-09-16 03:37:51 +02:00
Markolie
611cb16df8
Add torch, more in-hand fixes
2015-09-16 03:22:01 +02:00
Markolie
9a81ab2e39
Minor adjustment to server room temperature min2
2015-09-16 02:41:21 +02:00
Markolie
637bbecfd1
Reduce computer lights
2015-09-16 01:57:31 +02:00
Markolie
0741669bd6
Implement remove_item_from_storage properly, syndi toolbox tool color update
2015-09-16 01:54:34 +02:00
Markolie
2098933ee4
welding_fuel fix
2015-09-16 01:37:51 +02:00
Markolie
0db98340f8
Further welding tool updates
2015-09-16 01:37:07 +02:00
Markolie
951b58af5a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate
...
Conflicts:
code/game/objects/items/weapons/tools.dm
2015-09-16 01:32:33 +02:00
Markolie
aeabab7248
Welding tool refactor, in-hand updates
2015-09-16 01:27:15 +02:00
Fox-McCloud
894d13fa4d
Merge pull request #2065 from Markolie/lawstate
...
Fixes
2015-09-15 17:42:34 -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
Markolie
914b3742ed
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate
2015-09-15 23:06:56 +02:00
Markolie
5e856a0aaf
Law manager channel fixes
2015-09-15 23:02:04 +02:00
Fox-McCloud
3aa9563f2b
Merge pull request #2049 from Markolie/display
...
Display case update
2015-09-15 16:02:43 -04:00
Fox-McCloud
5bec1b3780
Merge pull request #2048 from Markolie/computor
...
Lower the layer of computer overlays
2015-09-15 16:01:20 -04:00
Fox-McCloud
f4daac4275
Merge pull request #2047 from Markolie/cargo
...
Update cargo shipping manifest
2015-09-15 16:01:06 -04:00
Markolie
98f2976739
Missing "
2015-09-15 18:50:57 +02: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
Markolie
8b6816fe9c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into computor
...
Conflicts:
code/game/machinery/computer/computer.dm
2015-09-15 17:39:43 +02:00
Fox-McCloud
37b215c8f2
Removes Handchewing While Cuffed
2015-09-15 07:38:24 -04:00
Fox-McCloud
844d203d0e
cleanup and restructure
2015-09-15 06:52:06 -04:00
Fox-McCloud
de98aa2b9d
Adds Materials to Ore
2015-09-15 06:08:20 -04:00
Ultimate Chimera
4b95dfd1ff
Adds in a Xenomorph Toy and adds the much needed Burns and Toxins kit to the Mining Outpost medbay!
2015-09-14 23:42:52 -06:00
Fox-McCloud
ff265d95d3
re-adding old grenades
2015-09-15 01:20:13 -04:00
Mark van Alphen
1539a4d1e8
Merge pull request #2041 from Fox-McCloud/backpacks
...
Backpack Storage Rework
2015-09-15 06:58:44 +02:00
Fox-McCloud
3e0a6d286d
tweaks
2015-09-15 00:12:41 -04:00
Fox-McCloud
1979043d84
Cluster Grenade Cleanup
2015-09-15 00:04:57 -04:00
Mark van Alphen
f1e03c466a
Merge pull request #2039 from Fox-McCloud/arcade-update
...
Arcade Update
2015-09-15 04:45:58 +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
TheDZD
6acec9eafe
Merge pull request #2028 from Fox-McCloud/mech-tweaks
...
Mech Balance Tweaks
2015-09-14 19:12:00 -04:00
Fox-McCloud
47cab7ed38
Merge pull request #2053 from Markolie/lesser
...
Fixes
2015-09-14 18:03:49 -04:00
Markolie
7a0c1bae77
Fix ore redemption deconstruction
2015-09-14 22:26:09 +02:00
Markolie
84c60aa560
Monkey/human transform fixes
2015-09-14 22:13:32 +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
Markolie
73bef4ea3e
Update light_power_on and light_range_on
2015-09-14 20:44:24 +02:00
Markolie
6ec0e011de
Fire alarm reset fix
2015-09-14 20:25:22 +02:00
Markolie
59b78376e9
Display case update, some forceMove updates
2015-09-14 20:21:56 +02:00
Markolie
812a7a5b08
Lower the layer of computer overlays
2015-09-14 19:06:10 +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
