Cheridan
4f108b6913
Merge pull request #16745 from coiax/muh-ore-box
...
Ore box changes
2016-04-09 15:43:02 -05:00
Jack Edge
71ffa79379
Changed WOOD variable to wo
2016-04-09 20:34:39 +01:00
Jack Edge
8c4d4df68d
Ore box deconstruction with a crowbar
2016-04-09 20:20:32 +01:00
KorPhaeron
d06a1ea62e
New Mining Loot ( #16718 )
...
New Mining Loot
2016-04-09 05:21:06 +01:00
Jack Edge
a066e1f3b4
Changed "the" to "/the"
...
I don't know why I did this, I was told to.
2016-04-08 21:49:42 +01:00
KorPhaeron
05e72de3f1
Merge pull request #16727 from ChangelingRain/mineate
...
You can no longer drop survival capsules on top of dense objects
2016-04-08 13:36:29 -05:00
Nerd Lord
5f955ad012
50% increase
2016-04-08 10:51:51 -04:00
Jack Edge
2250fa6929
Cyborgs can use ore boxes when adjacent
...
Also, you can't empty an ore box unless you're next to it.
It's possible that was innately enforced before I did some changes,
with the super call in Topic(), so I checked explicitly.
Oh, also ore boxes now drop their ore when destroyed.
2016-04-08 15:26:22 +01:00
Jack Edge
64e03b60fc
Removed automatic inventory close when ore dumping
...
Not really sure why this is here, surely you want to see the now empty
bag if you've got it open?
2016-04-08 14:52:37 +01:00
Jack Edge
f2700e05a1
Fixed "emptying satchel" messages for ore boxes
...
Regardless of what container you were emptying into the ore box,
it would always call it a satchel. This has been fixed.
2016-04-08 14:19:25 +01:00
KorPhaeron
3478183cd8
Merge pull request #16624 from TechnoAlchemisto/Better_pickaxes
...
Makes pickaxe upgrades less horrible and irrelevant.
2016-04-08 01:29:34 -05:00
Nerd Lord
ae22f792c2
fuck this in particular
2016-04-07 20:30:33 -04:00
Nerd Lord
46f0dd8734
you can no longer drop survival capsules on top of dense objects, like windows
2016-04-07 19:13:20 -04:00
Razharas
89d8e8dfca
Merge pull request #16679 from Core0verload/LAVALAND-SUCKS
...
Asteroid fixes
2016-04-07 23:52:37 +03:00
KorPhaeron
b5b523f7f0
Black Bedsheets
2016-04-07 14:42:26 -05:00
KorPhaeron
166cb54a60
Fixes for survival pod, GPS toggling
2016-04-07 11:49:50 -05:00
KorPhaeron
2c091aee80
Various Mining Pod Fixes
2016-04-06 17:25:18 -05:00
KorPhaeron
f743754ec3
Survival Pod
2016-04-06 15:36:53 -05:00
KorPhaeron
5e416d2188
Merge pull request #16661 from ChangelingRain/fixkorsshit2k16
...
Fixes minerals showing up weird with mining scanners
2016-04-06 10:57:31 -05:00
c0
feb6c6bdf3
Asteroid fixes
2016-04-06 11:39:45 +03:00
KorPhaeron
55ca4d89ca
Merge pull request #16641 from ChangelingRain/coolitoff
...
Simple Animal ranged cooldowns now use world.time
2016-04-05 18:45:48 -05:00
KorPhaeron
511f65200d
Shorter ash storms
...
* Shorter ash storms
2016-04-05 20:05:12 +02:00
KorPhaeron
91255b25e2
Merge pull request #16623 from TechnoAlchemisto/explore_this_fam_unzips_pickaxe
...
Lets pickaxes be held in explorer suits.
2016-04-05 11:11:51 -05:00
Nerd Lord
0741e4876b
Fixes minerals showing up weird with mining scanners
2016-04-05 12:03:13 -04:00
Cheridan
663cabf337
Merge pull request #16625 from KorPhaeron/building
...
Fixes blueprints not working on lavaland
2016-04-05 10:38:24 -05:00
Nerd Lord
8038c4dd33
Simple Animal ranged cooldowns now use world.time
...
this might fuck stuff up but ~oh well~
2016-04-04 19:59:59 -04:00
TechnoAlchemist
d4f6c01b1c
Line Spacing
2016-04-04 16:35:25 -07:00
Nerd Lord
d5a9fc1319
IT IS DONE
2016-04-04 10:31:13 -04:00
KorPhaeron
0e52777d19
Fixes blueprints on lavaland
2016-04-04 04:14:36 -05:00
TechnoAlchemist
fd361c1862
Makes pickaxe upgrades less horrible and irrelevant.
2016-04-04 01:52:20 -07:00
TechnoAlchemist
1d96a76eba
Lets picks be held in explorer suits.
2016-04-04 01:41:14 -07:00
duncathan
7751f41d25
fixes compilation warnings; speeds up roundstart init a bit
2016-04-03 22:59:28 -06:00
duncathan
a2a554c48a
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
code/game/objects/explosion.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/structures/girders.dm
code/game/objects/structures/grille.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/events/wormholes.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
KorPhaeron
c93abbb0b9
Adds Techno's absinthe to mining
...
* Absinthe
* Formatting
2016-04-02 23:48:24 -04:00
Isratosh
fa122fe793
Adding admin logs to bluespace shelter capsules.
...
* Adding admin logs to bluespace shelter capsules.
* Only logs when not on mining or lavaland z level
2016-04-02 02:42:18 -06:00
Nerd Lord
7d5dce7e10
this, on the other hand, is byond's fault
2016-04-01 20:10:07 -04:00
KorPhaeron
2be10e302f
Uses temp overlays for material scanners
2016-03-31 17:15:06 -05:00
KorPhaeron
f2d5345093
Mesons
2016-03-31 17:02:50 -05:00
Nerd Lord
36b5b91c04
Fixes minerals not spreading
2016-03-31 15:17:18 -04:00
KorPhaeron
55434a673d
Heavy Weapon Fix
2016-03-31 12:23:46 -05:00
KorPhaeron
a74b7c209c
Mining Drone Upgrades
2016-03-31 03:41:03 -05:00
duncathan
eeb0119acb
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
code/game/gamemodes/nuclear/nuclearbomb.dm
code/modules/mob/mob_movement.dm
code/modules/recycling/conveyor2.dm
2016-03-30 22:55:00 -06:00
KorPhaeron
721ef94443
Fixes icons for real
2016-03-30 17:51:28 -05:00
KorPhaeron
9711586a70
Icon Fix
2016-03-30 17:31:40 -05:00
KorPhaeron
b388e76f9c
Knives and thermal protection
2016-03-30 13:28:38 -05:00
KorPhaeron
e3dcebc65e
Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2
...
# Conflicts:
# icons/mob/head.dmi
# icons/obj/clothing/hats.dmi
2016-03-30 02:12:20 -05:00
KorPhaeron
d987bc0aad
Temperature resist
2016-03-30 01:43:50 -05:00
KorPhaeron
ca5b67e119
Explorer Gear
2016-03-30 01:27:22 -05:00
duncathan salt
5ff2020202
Merge pull request #16357 from Iamgoofball/fast
...
Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem
2016-03-29 20:06:55 -06:00
duncathan
e86cf0f280
praise the good lord, for the game finally compiles
2016-03-29 19:04:37 -06:00
