phil235
0caa59b21a
First commit of this big PR
...
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
duncathan
e86cf0f280
praise the good lord, for the game finally compiles
2016-03-29 19:04:37 -06:00
duncathan
3f1375ba39
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomZLevels/Cabin.dmm
_maps/RandomZLevels/beach2.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
_maps/map_files/MetaStation/MetaStation.v41I.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
_maps/map_files/generic/z4.dmm
_maps/templates/lavaland_surface_automated_trade_outpost.dmm
_maps/templates/lavaland_surface_biodome_winter.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
code/controllers/subsystem/air.dm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/nuclear/nuclearbomb.dm
code/game/machinery/computer/arcade.dm
code/game/objects/effects/aliens.dm
code/game/objects/effects/overlays.dm
code/game/objects/items/apc_frame.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/girders.dm
code/game/turfs/simulated.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/mineral_floor.dm
code/game/turfs/simulated/floor/plating.dm
code/game/turfs/simulated/river.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/simulated/walls_reinforced.dm
code/modules/admin/verbs/buildmode.dm
code/modules/atmospherics/environmental/LINDA_turf_tile.dm
code/modules/events/spacevine.dm
code/modules/flufftext/Hallucination.dm
code/modules/holodeck/turfs.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/interactive.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/bot/floorbot.dm
code/modules/mob/living/simple_animal/guardian/guardian.dm
code/modules/mob/living/simple_animal/hostile/hostile.dm
code/modules/mob/mob_movement.dm
code/modules/power/singularity/narsie.dm
code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
duncathan
b9950c4358
turf/open and turf/closed
2016-03-29 13:38:56 -06:00
xxalpha
688137c7dc
icon smooth ss
...
adjustments
adjustements
atharrachaidhean
2016-03-12 23:57:45 +00:00
duncathan
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06: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
xxalpha
7c0c66dba3
Merge remote-tracking branch 'upstream/master' into urange
2016-02-17 14:21:29 +00:00
AnturK
dcf5bfb273
Holodeck fixes
2016-02-12 14:03:36 +01:00
Bjorn Neergaard
ccc229a157
Fix bad checks in holodeck
2016-02-04 16:29:23 -06:00
xxalpha
9154e6cbf2
ultra range again
2016-02-03 07:58:41 +00:00
xxalpha
062cb76e29
Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj
2016-01-30 19:45:45 +00:00
xxalpha
83a4491756
Space icon state function is a define.
2016-01-30 19:44:20 +00:00
Firecage
7f96592b87
Merge Conflict Fix
2016-01-27 13:29:38 +02:00
xxalpha
af7059e1f3
Divide beach coast icon into two.
2016-01-17 23:26:43 +00:00
Firecage
754491ce4c
Changes relatives paths into absolute paths and makes some if()'s better
2016-01-17 01:36:56 +02:00
tkdrg
c64430a0fd
Merge pull request #13996 from AnturK/fixfixfix
...
Minor fixes
2015-12-26 10:23:21 -03:00
AnturK
72bc9591a2
This is bit better.
2015-12-26 14:10:09 +01:00
KorPhaeron
a0923daa0e
Removes NOSHIELD
2015-12-20 15:21:58 -06:00
KorPhaeron
d8a37204e7
Makes burn_state use defines
2015-12-13 05:36:55 -06:00
duncathan salt
0472592b97
Merge pull request #13327 from KorPhaeron/reactive
...
check_shields() refactor
2015-12-07 19:58:17 -06:00
Vincent
16303c1c1f
Changes flag name from ABSTRACT to NODECONSTRUCT
...
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this. Removes spurious tag tags in Z2.
2015-11-30 20:26:03 -05:00
KorPhaeron
fab3cdc3a2
Cleans up copypaste, adds missing block chances
2015-11-30 16:39:02 -06:00
KorPhaeron
2609adb29d
Blocking overhaul
2015-11-30 16:22:31 -06:00
Vincent
7bfa03a5ee
Fixes #13277 Lasers beams spawning after the holdout sim ends
2015-11-28 17:39:02 -05:00
Vincent
026e6ee772
Sets up the the ABSTRACT flag to be used by machines and structures that should not be disassembled or break into parts.
...
This is specifically used by the holodeck for things that should be immune to disassembly.
Fixes invisible windoors in the holodeck.
Standardizes the fire axe's interaction with windows.
Fixes a runtime with holodeck tiles getting broken or burned.
2015-11-26 21:11:54 -05:00
Incoming
1f9f0dfc40
Adds subtypesof(). It's shorthand for typesof(path) - path.
...
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
Vincent
faf5ddaceb
Holodeck refactor and Enchancements
...
Moves holodeck code to modules/holodeck. Repaths holodeck structures a little. Cleans holodeck code and prepares for additional features (multiple holodecks, etc). Should fix #4828 .
Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.
All items spawned by the holodeck will do only stamina damage, except when emagged. This allows emergency medical to be staffed with scalpels and bonesaws and such. Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05:00
