b18cb5fca8
making shit compile
2015-12-28 08:31:20 -06:00
f6db2f4ac9
Merge pull request #14067 from AnturK/mulecratefix
...
Fixes mulebot crates
2015-12-27 14:21:47 -03:00
af70509257
Fixes mulebot crates
2015-12-26 17:24:16 +01:00
64bc7ee1e1
Detective starts with his bowman on
2015-12-25 02:14:19 -06:00
130a4e0242
Merge pull request #13877 from LanCartwright/thesethingsdontgrowontreesyouknow
...
Removes Bulldogs from roundstart syndicate ship
2015-12-24 22:21:55 -03:00
5821dd81ad
we dont have a shotgun tree you know
2015-12-21 13:37:31 +00:00
1e7fcd3e9f
unbricks the rpgloot event.
...
fixes a rare issue with the imposter event.
2015-12-20 01:15:03 -05:00
3d75589f02
Merge pull request #13689 from KorPhaeron/volcanic_rocks
...
Volcanic Rocks
2015-12-18 03:27:02 -03:00
134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
cde4df61ae
conFLICTS
2015-12-16 06:26:54 -05:00
b8925a1b49
Merge pull request #13621 from xxalpha/airlox
...
Added maintenance glass airlock and external glass airlock.
2015-12-16 21:34:24 +11:00
571d30a25c
Volcanic rocks
2015-12-15 23:31:14 -06:00
392ca2a505
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
2015-12-15 16:54:22 -05:00
d07f300063
i did things
2015-12-15 16:46:24 -05:00
e9e4ff735d
Added maintenance glass airlock and external glass airlock.
2015-12-14 00:48:01 +00:00
d8a37204e7
Makes burn_state use defines
2015-12-13 05:36:55 -06:00
0ece383776
Fixes girders on low layer
2015-12-11 02:29:46 -06:00
f222dfe36e
mostly final changes, wowzers
2015-12-08 21:20:31 -05:00
c384aae4c3
more map edits, loot table balancing, bug fixes, also ATV VROOM VROOM
2015-12-08 00:43:53 -05:00
6c685d6d67
wew
2015-12-06 02:14:26 -05:00
8ab579cb21
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
...
Conflicts:
icons/mob/animal.dmi
2015-12-04 18:55:10 -05:00
6ac96194ba
snow stuff.
2015-12-04 18:52:17 -05:00
6f6968773b
Fixes #13418
2015-12-03 22:46:56 -05:00
77b36e2415
iced windows, more ice variants of shit in general.
...
more stuff, ice everything.
wew
conflict fix
2015-12-01 16:45:09 -05:00
bf530cc3dd
Fixes untouchable windows
...
Sorry about that. Fixes #13354
2015-12-01 11:54:09 -05:00
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
b31b5e3f77
Fix Conflicts:
...
code/game/machinery/doors/windowdoor.dm
2015-11-30 18:56:43 -05:00
78c95ab035
Merge pull request #13317 from neersighted/airlock_electronics
...
NanoUI Airlock Electronics
2015-11-30 20:43:33 +03:00
05ae680b06
Fixing conflicts:
...
code/game/machinery/computer/computer.dm
code/game/machinery/doors/windowdoor.dm
code/game/objects/structures/window.dm
2015-11-29 19:02:30 -05:00
f214e547cb
NanoUI Airlock Electronics
...
Also reworks a lot of the AE code.
2015-11-29 11:32:56 -06:00
38eddb1421
Merge pull request #13179 from AnturK/academy
...
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
da0c466f82
Merge pull request #13149 from Firecage/toolspeed
...
Adds toolspeed
2015-11-29 21:06:15 +11:00
2abaa2b0f1
Merge pull request #13045 from KorPhaeron/laserbox
...
Fixes reflector structure being on a low layer
2015-11-28 20:42:21 -06:00
4245481019
Lower layer but still higher than it was
2015-11-28 18:48:42 -06:00
9a434b669c
Academy Fixes
2015-11-28 23:17:57 +01:00
b662b470a9
Enables ghost to go through ladders
...
Adds Cold snow turf
Adds Infinite Candles
2015-11-28 18:14:52 +01:00
592553354f
Merge pull request #12899 from TechnoAlchemisto/master
...
Makes cloaks into Exosuits as god(I) intended.v2
2015-11-27 22:22:47 +00:00
0218d51938
Better fireaxe-grill interactions
2015-11-27 15:38:37 -05:00
fdede51a09
Merge pull request #12954 from MMMiracles/spookycaves
...
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
383e77db8a
Merge pull request #13220 from KorPhaeron/godwillsit
...
Adds knight armour
2015-11-27 13:58:08 -06:00
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
e36853d7c9
Convert bots to simple animals - Updated 7.0
2015-11-26 22:06:07 +01:00
2d94b0ff9b
feedback changes:
...
added more loot
nerfed the spawn rates and health of the spawners
widened the paths of some areas for lava passages
added a medbay area to the first level incase of stupid people not coming prepared
added 2 mining rigsuits, may be difficult to get though
fixed(?) issues with dicklys drilling ladders and basalt floors causing issues
2015-11-25 23:24:42 -05:00
c8f3ca728f
Adds Knight Armour
2015-11-25 15:46:54 -06:00
77de108fe7
Merge pull request #13143 from Anonus/blobactors
...
Fixes up blob_act()
2015-11-22 18:42:15 +01:00
ab1e9f2d15
Merge pull request #13160 from Firecage/optablefix
...
Fixes op table buckling Take #2
2015-11-22 18:38:19 +01:00
e1891440fa
Fixes op table buckling
2015-11-22 19:29:26 +02:00
c933363062
Adds the toolspeed var and adds it to most usages of tools which has a timer
2015-11-21 19:24:14 +02:00
f458c2cead
The blob eats nondense things in all cases.
...
Probably fixes one or two bugs in the process.
2015-11-20 21:03:43 -05:00
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
duncathan