Commit Graph

357 Commits

Author SHA1 Message Date
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
Tkdrg
ae1c4c3007 Fixes server crash by abusing containment fields 2016-02-08 21:08:45 -03: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
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02: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
MMMiracles
f8d53ef78e changes abductor guide to current procedure, removes extra message from containment field shocking 2016-01-06 20:40:26 -05: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
Cheridan
cb27e966eb Merge pull request #14144 from TheRealGLH/electric_chair
Containment fields and electric chairs now use electrocute_act
2015-12-31 19:01:52 -06:00
TheRealGLH
9cb962cbc1 removes argument that did not need to be specified 2015-12-30 09:34:42 +01:00
duncathan
17f167bcb7 associative list 2015-12-29 13:33:12 -06:00
Martijn Daniels
a7865bd9cf electrocute_act
Changes containment field and electric chair effects to use
electrocute_act
2015-12-29 13:36:16 +01:00
duncathan
b18cb5fca8 making shit compile 2015-12-28 08:31:20 -06:00
Shadowlight213
39b3686726 Adds fingerprint transfer from sing generator to sing. 2015-12-22 20:19:44 -08:00
AndrewJacksonThe2nd
9582db7247 Adds the Tesla Engine to the game. 2015-12-19 12:27:32 -08:00
KorPhaeron
d564e1e2f3 Lava proofing 2015-12-17 01:48:11 -06:00
oranges
134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
Tkdrg
8ead3e8628 Cult Overhaul
Cult is awful, so let's try to improve it. Idea by KorPhaeron. I also
took some inspiration from adrix89's sacrifice cult, so credits to him.
Also thanks a lot specially to MrPerson and Iamgoofball for helping
me brainstorm this, and Joan for the sprites for the summoning orb,
the large nar-sie shell, and the new cult antag hud.

Basically, we remove conversion, and turn cult into a magic version of
nuke, with a small team of stealth elite cultists that have to build a
base in the station and sacrifice people in order to build an army of
constructs and get materials to eventually summon Nar-Sie.

Stun talismans and conversion are gone. Nar-Sie is now the only
objective. Sacrifice runes now provide summoning orbs, which you can use
to drop a large shell. Insert enough orbs in the shell and you trigger a
Delta. Defend the shell for 3 minutes and Nar-sie will arise. This shell
is bombproof and singularityproof. It may be summoned up to three times
if destroyed, but you will have to start from the beginning sac-wise.

Runes are now RNG. Each cultist only gets 50% of the runes. Inspiration
is basically The Binding of Isaac here (thank you MrPerson for this!).
Furthermore, many old runes were merged/removed and other new ones were
added. Almost all were massively rebalanced. Cult now also has a
stealthy ritual dagger with high bleeding and throw effects.
2015-12-15 04:59:31 -03:00
Nerd Lord
58a3f742c6 Spawnable hostile constructs, for away missions and adminfuckery. 2015-12-05 10:48:52 -05:00
Jordie
da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11: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
3f1a28869f A STRONG INDEPENDENT ELDER GOD THAT DOESN'T NEED NO MACHINES 2015-11-16 17:08:25 -05:00
Nerd Lord
91095f57ce Constructs now have action buttons!
Cult floors and walls now have a glow effect when spawning in.
Nar-Sie uses a span class just for it spawning. Get spook.
2015-11-16 15:21:41 -05:00
Nerd Lord
757d009e4f Constructs now have action buttons!
Cult floors and walls now have a glow effect when spawning in.
Nar-Sie uses a span class just for it spawning. Get spook.
2015-11-16 15:20:13 -05:00
Razharas
62cd83fa30 Merge pull request #12778 from AnturK/minor_upgrades
Mech Speech Bubbles, POI list for Observe
2015-11-15 09:07:21 +03:00
duncathan salt
67ae63161f Merge pull request #12938 from KorPhaeron/emitters
Allows you to var edit emitter projectiles
2015-11-13 00:16:11 -06:00
KorPhaeron
21c6e50ee3 Custom emitters 2015-11-09 05:45:31 -06:00
Tkdrg
88f64c607e Ghost HUD tweaks
Removes links in tooltips. Makes alerts work as clicks when applicable.

Fixes #12843
Fixes #12844
2015-11-08 22:53:41 -03:00
phil235
e388b968a4 Merge pull request #12897 from KorPhaeron/harvester
Harvesters spawned by nar-sie are no longer culted
2015-11-08 21:45:02 +01:00
KorPhaeron
59e82d8e4b Nar-Sie 2015-11-07 02:45:58 -06:00
kingofkosmos
e75d24a6c9 Changes checks in altclicks from canusetopic to incapacitated. 2015-11-01 11:24:17 +02:00
AnturK
a7334f95b6 Adds POI List, makes orbit use it. 2015-10-31 20:02:06 +01:00
Razharas
ee555c6a5c Merge pull request #12682 from Incoming5643/demonic_blinking_goose
Fixes icon blinking on level five singularities
2015-10-28 19:31:39 +03:00
Tkdrg
dd20530f0e Adds ghost alerts.
Adds ghost alerts for revival (cloning, MMIs, nar-sie, drones, etc).
2015-10-27 23:07:41 -03:00
Incoming5643
9d32d5b5ce Don't code with the web interface, kids 2015-10-27 19:43:45 -04:00
Incoming5643
2352d34036 Don't code while sleep deprived kids 2015-10-27 11:41:23 -04:00
Incoming
2825d2a6f2 apparently you have to give switch() some personal space 2015-10-27 02:24:34 -04:00
Incoming
11ae42e9cf Fixes icon blinking on level five singularities
What had happened: when stage six was added stage five's survivability took a stealth nerf, because any time the singularity reached enough energy to go six but hadn't eaten a supermatter shard (read: almost ever time) it would be force set to 2000 energy.

The problem: 2000 energy is the verge of stage four, so every time this hard set was hit (and for a hungry singulo this could be every consume check) the energy would be set to 2000. Then, at the same time, the singulo would suffer a little energy loss, momentarily become level four. Then, still all the same breath here, any new items would be eaten, pushing it back into level five.

Thus the singulo blinked.

As far as I can tell this was an unreported issue.
2015-10-27 02:11:25 -04:00
phil235
d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
xxalpha
e82a216447 Changed various instances of range() and orange() to ultra_range(). 2015-10-19 20:04:14 +01:00
Remie Richards
ebff3936b7 Merge pull request #12221 from Xhuis/im_here
Restores the Nar-Sie sound to "I'm here"
2015-10-13 23:04:56 +01:00
Razharas
84a5511836 Merge pull request #12283 from KorPhaeron/inworld
Removes a bunch of in world
2015-10-12 12:12:35 +03:00
KorPhaeron
31836a5deb Removes in world 2015-10-09 22:37:53 -05:00
phil235
c4c447a8dc Fixes hotspot having two New() procs.
Fixes many machines and a few structure not having a cooldown when attacked with an item.
Fixes not being able to eat or be facehugged when wearing riot helmet with visor up.
Fixes not being able to use child of the tool type for craft recipes requiring tools.
Tablecrafting failure message now tells you what caused the failure (missing tool, missing component)
Fixes fuego plasma burrito recipe.
Fixes being able to grab cups from water cooler with telekinesis, putting the cup directly in your hand.
Fixes golem appearing with their old human name for a split second.
Some changes to make code more OOP (take_damage() proc for barricade, shieldgen, etc)
Some tweaks to light tube building code.
2015-10-08 19:50:01 +02:00
Xhuis
532c796e32 Nar-Sie sound restoration 2015-10-07 17:22:47 -04:00
Xhuis
5f99b313cc Radiation changes 2015-09-26 13:33:27 -04:00
Razharas
1105a2b820 Merge pull request #11899 from kingofkosmos/altclickrotatepipe
Alt-click to rotate stuff
2015-09-24 01:59:04 +03:00