tkdrg
a51c987ae2
Merge pull request #15589 from KorPhaeron/weather2
...
Fixes up weather performance
2016-02-20 09:31:12 -03:00
AnturK
56d2a34201
Splits beds and chairs
...
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
Cheridan
cfcecba389
Merge pull request #15575 from phil235/ReviveFix1
...
Fixes mob revival
2016-02-17 20:42:10 -06:00
KorPhaeron
67aec79ecf
Weather
2016-02-17 16:28:59 -06:00
xxalpha
7c0c66dba3
Merge remote-tracking branch 'upstream/master' into urange
2016-02-17 14:21:29 +00:00
phil235
7e1efca13a
Created two new procs to handle reviving mobs more easily:
...
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.
I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)
This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
Bjorn Neergaard
205809c25f
Unanchor gibtonite, fix up some pull code
2016-02-13 00:26:28 -06:00
Bjorn Neergaard
401fe06e1c
Fix two small errors
2016-02-08 00:01:54 -06:00
Bjorn Neergaard
ddab6823d3
Fix up crates
...
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
xxalpha
9154e6cbf2
ultra range again
2016-02-03 07:58:41 +00:00
Firecage
7f96592b87
Merge Conflict Fix
2016-01-27 13:29:38 +02:00
Bjorn Neergaard
b2629a56e2
Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes
2016-01-22 19:25:33 -06:00
Bjorn Neergaard
87b0857b93
Refactor wire datums
...
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
2016-01-22 19:22:09 -06:00
Nerd Lord
dc6ecbe8f3
missed one
2016-01-20 15:51:33 -05:00
Firecage
d1327d4076
Merge conflict fix
2016-01-19 10:02:50 +02:00
Razharas
f7ae437e74
Delete the crate instead of doing nothing
...
Delete the crate instead of doing nothing
2016-01-18 12:32:31 +03:00
Firecage
0cb6814c18
Merge conflict fix
2016-01-17 19:15:30 +02:00
Razharas
f727857c19
Fixes loot crates and animal attacks
...
Fixes loot crates and animal attacks
Fixes https://github.com/tgstation/-tg-station/issues/10412
2016-01-17 19:32:42 +03:00
Razharas
a2ecfc0fc4
Merge pull request #14405 from Kole6738/patch-4
...
Prevent flipping a coin if wired
2016-01-17 15:46:08 +03:00
Firecage
754491ce4c
Changes relatives paths into absolute paths and makes some if()'s better
2016-01-17 01:36:56 +02:00
duncathan
9066bc7c4f
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
code/controllers/subsystem/air.dm
code/datums/gas_mixture.dm
code/game/objects/items/devices/scanners.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/living/carbon/life.dm
tgui/assets/tgui.css
tgui/assets/tgui.js
tgui/scripts/interfaces/atmos_filter.ract
2016-01-13 20:07:21 -06:00
tkdrg
d8f168f3da
Merge pull request #14529 from AnturK/evenmorefixes
...
Misc fixes
2016-01-09 20:32:02 -03:00
tkdrg
24b7eaa23a
Merge pull request #14488 from KorPhaeron/wall_layer
...
Walls are a slightly higher layer than floors
2016-01-09 18:41:59 -03:00
KorPhaeron
1d9b334e50
Fixes layers
2016-01-09 15:32:35 -06:00
AnturK
23efe5f675
Adds a variable to block shuttles from changing destinations midflight for mining shuttle
2016-01-09 17:44:16 +01:00
Tkdrg
b6d0cee2f7
Merge branch 'KorPhaeron-lava_rivers' into HEAD
...
Closes #13511
2016-01-09 12:07:34 -03:00
KorPhaeron
b96bec5157
River Generation Module
...
This is going to be used for lava rivers in lavaland.
2016-01-09 12:06:55 -03:00
duncathan salt
227b3149b2
Merge pull request #14441 from SouDescolado/master
...
Fixes abandoned crates minigame / Also fixes tuberculosis kit
2016-01-08 07:16:22 -06:00
KorPhaeron
224c5d1029
Use defines
2016-01-07 13:10:12 -06:00
KorPhaeron
c93fcdb5dc
Wall layer
2016-01-07 13:02:36 -06:00
Cheridan
d16fe1c490
Merge pull request #14419 from KorPhaeron/chasm_fix
...
Chasm Fix
2016-01-06 13:30:17 -06:00
SouDescolado
4a7cb6a066
Fixes abandoned crates minigame
...
Replaces the user input 0 with "z"(Code side only. Player can still use
0). Wont return 0 as "cows" anymore.
Remove useless variable
2016-01-06 10:43:54 -02:00
Kole6738
d20194a546
removes else
2016-01-05 18:28:31 -08:00
Kole6738
f88595d073
Thanks
2016-01-05 15:25:21 -08:00
KorPhaeron
936973a68d
Chasm Fix
2016-01-05 13:54:12 -06:00
Kole6738
292837a248
Prevent flipping a coin if wired
...
Fixes graphical bug #14343 with extreme overkill. If the coin has an attached wire, it won't flip. Someone else might want to instead fix the animation so that the wire moves with the coin.
2016-01-04 18:36:32 -08:00
Nerd Lord
4815a0f37c
Simple animals no longer convert other damage types to brute using the brute damage proc, allowing you to make mobs immune to brute but not all damage types.
...
No, no, do it properly not half-ass it
2016-01-04 15:29:23 -05:00
duncathan salt
c510fb69c2
Merge pull request #14337 from AnturK/miningbot
...
Fixes mining bot being hard to repair.
2016-01-04 20:23:23 +01:00
MrStonedOne
5d86ed49f6
Merge conflic fix
2016-01-03 14:51:14 -08:00
AnturK
41f7d95aa4
Fixes mining bot being hard to repair.
...
Stops bruisepacks working on mining bot
2016-01-03 13:18:02 +01:00
Aranclanos
29977a2d16
Merge pull request #14243 from KorPhaeron/darkness
...
Fixes floor is lava and advanced darkness
2016-01-03 02:54:21 -03:00
KorPhaeron
28a0c48403
Moves spawn to weather
2016-01-02 23:21:46 -06:00
MrStonedOne
b50e8d2a63
removes a bunch of unneeded spawns
...
spawns have a high overhead.
I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
duncathan
b18c6c2c5c
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
nano/assets/nanoui.js
nano/bower.json
nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
KorPhaeron
dde4690cb4
Fixes floor is lava and advanced darkness
2016-01-01 05:43:17 -06:00
tkdrg
e5941a59a2
Merge pull request #14124 from KorPhaeron/darkness
...
Advanced Darkness (wizard event)
2016-01-01 00:51:55 -03:00
KorPhaeron
b9bf6ef547
Advanced Darkness
2015-12-31 19:32:02 -06:00
KorPhaeron
ff5767d785
Nevermind
2015-12-30 20:12:40 -06:00
KorPhaeron
9499d35c6b
Diety name
2015-12-30 19:39:35 -06:00
KorPhaeron
79e5f3d37e
Check that actually works
2015-12-30 19:10:49 -06:00
