Commit Graph

1697 Commits

Author SHA1 Message Date
Vincent
bf530cc3dd Fixes untouchable windows
Sorry about that.  Fixes #13354
2015-12-01 11:54:09 -05: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
Vincent
b31b5e3f77 Fix Conflicts:
code/game/machinery/doors/windowdoor.dm
2015-11-30 18:56:43 -05:00
Razharas
78c95ab035 Merge pull request #13317 from neersighted/airlock_electronics
NanoUI Airlock Electronics
2015-11-30 20:43:33 +03:00
Vincent
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
Bjorn Neergaard
f214e547cb NanoUI Airlock Electronics
Also reworks a lot of the AE code.
2015-11-29 11:32:56 -06:00
Jordie
38eddb1421 Merge pull request #13179 from AnturK/academy
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
Jordie
da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
Cheridan
2abaa2b0f1 Merge pull request #13045 from KorPhaeron/laserbox
Fixes reflector structure being on a low layer
2015-11-28 20:42:21 -06:00
KorPhaeron
4245481019 Lower layer but still higher than it was 2015-11-28 18:48:42 -06:00
AnturK
9a434b669c Academy Fixes 2015-11-28 23:17:57 +01:00
AnturK
b662b470a9 Enables ghost to go through ladders
Adds Cold snow turf
Adds Infinite Candles
2015-11-28 18:14:52 +01:00
Dorsisdwarf
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
Vincent
0218d51938 Better fireaxe-grill interactions 2015-11-27 15:38:37 -05:00
Remie Richards
fdede51a09 Merge pull request #12954 from MMMiracles/spookycaves
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
duncathan salt
383e77db8a Merge pull request #13220 from KorPhaeron/godwillsit
Adds knight armour
2015-11-27 13:58:08 -06: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
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
MMMiracles
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
KorPhaeron
c8f3ca728f Adds Knight Armour 2015-11-25 15:46:54 -06:00
phil235
77de108fe7 Merge pull request #13143 from Anonus/blobactors
Fixes up blob_act()
2015-11-22 18:42:15 +01:00
phil235
ab1e9f2d15 Merge pull request #13160 from Firecage/optablefix
Fixes op table buckling Take #2
2015-11-22 18:38:19 +01:00
Firecage
e1891440fa Fixes op table buckling 2015-11-22 19:29:26 +02:00
Firecage
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
Nerd Lord
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
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
KorPhaeron
668521f195 Fixes reflector layer 2015-11-15 19:40:46 -06:00
duncathan salt
1a54000a35 Merge pull request #13020 from Xhuis/this_pr_was_a_time_sink
Sink changes
2015-11-15 16:02:14 -06:00
Xhuis
a24ddbd7b7 Sink changes 2015-11-14 09:44:39 -05:00
phil235
e20e03562a Fixes your shield blocking the bullets when committing suicide with a gun.
Merged kill_count and range var into one var/range for obj/item/projectile.
Simplified projectile/proc/Range().
Fixes timestoped projectiles still calling Range() and thus being deleted despite being stopped.
Fixes projectile being invisible when on the first tile in front of the shooter (which meant no sprite showing when shooting a target 1 tile away)
Simplifies kinetic/Range()
2015-11-12 19:45:50 +01:00
duncathan salt
9339662a28 Merge pull request #12768 from xxalpha/windows10
Made it possible to paint windows to make them opaque.
2015-11-11 10:32:18 -06:00
phil235
5e43d2b570 Merge pull request #12924 from Firecage/Optable
Changes the operating table to be an actual table.
2015-11-11 17:31:38 +01:00
duncathan salt
e5f8c3f941 Merge pull request #12900 from KorPhaeron/laserbox
Immovable reflectors for admins/mappers
2015-11-10 23:21:20 -06:00
Firecage
9ce5334890 merge conflict fix 2015-11-10 18:44:10 +02:00
Firecage
618e54087d Makes abductor Optables not deconstructable. 2015-11-10 17:21:12 +02:00
Cheridan
5f2ed41bc6 Merge pull request #12873 from KorPhaeron/zipties
Captain and HoP lockers now contain zipties
2015-11-10 08:03:53 -06:00
Firecage
b2937bf315 Changes the operating table to be an actual table. 2015-11-08 22:09:35 +02:00
Tkdrg
8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
2015-11-07 15:56:39 -03:00
Tkdrg
d966c37c6a Hand of God Fixes/Tweaks
Fixes healing fountain construction sprite.
Nexus are now destroyed properly.
Borged cultists will now lose antag status properly.
Round end message fixed.
Feedback messages improved to be clearer, and lots of typos fixed.
Smite no longer uses up faith if there is no valid target in the turf.
Adds an atom/attack_god() proc.
Fixes the greeting messages for prophets and followers, improves god msg.
Fixes nexus being spawned on dense turf after 2min, and general sanity.
Fixes attacking structures with abstract items.
Adds click delay and attack animation for attacking structures.
Fixes a lot more typos.
Fixes defense pylon friendly fire.
Makes defense pylon togglable on its god's click.
Cleans up gun_turret code a little in general.
Adds deconversion by loyalty implant or holy water (basically rev+cult).
Gods will now die when they have no followers left.
Adds the HoG gods to the traitor panel.
2015-11-07 15:25:28 -03:00
KorPhaeron
ba4cb7a565 Laserbox 2015-11-07 04:22:30 -06:00
TechnoAlchemist
7b7a3cfd53 puts the new exosuit head of staff cloaks in their lockers. This time for real. 2015-11-07 01:28:44 -08:00
KorPhaeron
f332f595a2 zip ties 2015-11-05 18:03:12 -06:00
Nerd Lord
0f23809346 Revenant changes XVIII
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
2015-11-05 18:50:51 -05:00
Razharas
cd1454a71c Merge pull request #12794 from kingofkosmos/altclickcheckfix
Alt+click checks fix
2015-11-03 04:19:38 +03:00
KorPhaeron
47d1d57a69 Removes spam 2015-11-01 17:04:49 -06:00
Razharas
3cd68567ab Merge pull request #12754 from KorPhaeron/headsets
Adds normal captains headset to captains locker
2015-11-02 01:35:25 +03:00
Remie Richards
046948f314 Merge pull request #12630 from KorPhaeron/Reflector
Laser Reflector Structure
2015-11-01 21:46:29 +00:00
KorPhaeron
99cc8aca9a Proper istype 2015-11-01 15:36:28 -06:00
xxalpha
9f4db8078b Made it possible to paint windows to make them opaque.
Not tinted windows

Changed how painting and opacity work.

Clean timer
2015-11-01 16:26:54 +00:00
KorPhaeron
f58dcd9e5d 3 types 2015-11-01 09:08:15 -06:00