Commit Graph

35915 Commits

Author SHA1 Message Date
AnturK b016998e3e Fixes buttons under doors. 2017-05-19 17:50:38 +02:00
Leo 49c2ea44c8 Merge pull request #27376 from ChangelingRain/ratvarwalls
If ratvar is alive, turning clockwork floors into clockwork walls is fast
2017-05-19 08:25:05 -03:00
swindly 8010794724 Adds modified syringe guns (#27276) 2017-05-19 08:24:37 -03:00
Leo 16a95305ee Merge pull request #27385 from kevinz000/patch-154
fixes aimed spells not recharging
2017-05-19 08:20:27 -03:00
Leo 50dd9c3cd2 Merge pull request #27384 from octareenroon91/patch-46
Fix choice for golems transferring between shells
2017-05-19 08:20:09 -03:00
4DPlanner c87e6f85ec Merge remote-tracking branch 'upstream/master' into clubbuff 2017-05-18 21:52:31 +01:00
Mike Long fdc79301d6 Adds a new toy to arcade prizes. A rumbling toy toolbox meant to mimic hisgrace (#27371)
* Adds a new toy to arcade prizes.  A rumbling toy toolbox meant to mimic hisgrace.

* Adds attack verb and fixes formatting on a list.
2017-05-18 10:56:28 -06:00
Tacolizard 264e8b8625 Plasmaman Plasma Tanks are just as large as normal emergency tanks (#27372)
* extreme power creep please ban me

* Update tank_types.dm
2017-05-18 10:55:34 -06:00
kevinz000 16b44c2937 [READY]Peacekeeper cyborg projectile dampening fields, attempt three (#27234)
* fields

* peaceborg dampeners

* hm

* nerfs recharge

* ...

* fffff

* objectively fields

* kinda_working

* why is this not working

* cheep

* bugfixes, adds to robot

* cross doesn't work ;-;

* on border

* appearance

* hi, is this a refactor?

* ffs

* ree

* monitor

* monitor

* hm

* all good

* Update robot_items.dm
2017-05-18 10:53:55 -06:00
Iamgoofball 85d770e855 Fixes obtaining blob chems (#27370) 2017-05-18 10:32:43 -06:00
AnturK 4294e92f62 Fixes some holocall issues (#27369)
* Fixes some holocall issues

* Actually this is fine.

* Notifies on holocall start
2017-05-18 10:31:29 -06:00
AnturK 7dd00e28ac Fixes bane runtimes (#27368)
* Fixes bane runtimes

* You're a big typo
2017-05-18 10:31:08 -06:00
kevinz000 6c0f3433a3 Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC (#27241)
* Update pneumaticCannon.dm

* Update uplink_item.dm
2017-05-18 10:27:51 -06:00
Iamgoofball 4e96f48eed Fixes bypassing cargo export values on minerals (#27252) 2017-05-18 10:26:11 -06:00
Mike Long 0c79d3ff8e Ninja Refactor (#27316)
* Begins converting Ninjas into the new antagonist datum system.  Does not compile.  Work in progress.

* More work towards datumizing ninjas. Still not finished. Now compiles.

* Adds ninja to traitor panel.

* Add objectives now takes an arg for number of objectives.

* Event now actually ninjas the ninja.

* Ninja suit initialization now works.

* Cleans up the suit initialization code some.

* Suit initialization is now action rather than verb based.

* Now properly adds objectives and memories to the mind upon gaining datum.

* Starts to replace ninja verbs with actions.

* Hooks ninja abilities up to action buttons.

* Whoops, missed a verb.  Gloves are next.

* Adds toggle ineraction type action button.

* Changes icons as per ChanglingRain's suggestions.

* Second round of changes for ChanglingRain

* Replaces sleeps with addtimers.  It's ugly, but more CPU efficient.

* Fixes compile errors.

* Fixes compile error, again.
2017-05-18 10:21:26 -06:00
coiax 9fabe5b0b5 Vending machines are more dangerous when throwing items (#27361)
* Vending machines are more dangerous when throwing items

🆑 coiax
add: Various vending machines, when shooting their inventory at nearby
people, will "demonstrate their products features". This means that if a
cigarette vending machine throws a lighter at you, it will be on.
Vending machines also choose random products when throwing, rather than
the first availible one.
/🆑

- Lighters are now flame coloured, and have been minorly refactored
- Secvendors prime flashbangs, and turn on their flashights when
throwing them at people.
- Cigarette vendors light their lighters
- The selection process shuffles the item list before iterating, so it
won't just throw the first thing

* Preprime grenade and set on fire with throwing

* Actually prime grenades when people use them
2017-05-18 10:11:55 -06:00
Leo e1554a0fda Merge pull request #27367 from AnturK/quickfix
Quick fix for AI language issues.
2017-05-18 12:44:24 -03:00
Joan Lung c97bfa0e9f Proselytizing alloy shards will now proselytize all the shards in the tile (#27337) 2017-05-18 12:42:44 -03:00
Leo a66febe2b5 Merge pull request #27359 from coiax/no-emp-c4
Plastic explosives can no longer be detonated by EMPs
2017-05-18 12:41:28 -03:00
Joan Lung 68bbd65ab8 fixes ratvar shuttles (#27347) 2017-05-18 12:37:13 -03:00
Cyberboss ee404b2170 World.dm Refactor (#27268)
* Cleanup world/New

* Moves some things from OnReboot SS Shutdowns

* Move mode handling procs to ticker

* Moves delayed reboot to ticker
Cleans up round end sound setting
Splits round end animation between SStitle and SSticker

* Moves PR announcement to where it can use the define

* Clean this bit up

* Move out datacore Initialization

* Fix some stuff

* Fix this for

* Different PR

* Gives admins reboot options

* Make it smaller
2017-05-18 21:53:46 +10:00
AnturK 83e90cca22 Fixes clicking things under windows/doors. (#27292) 2017-05-18 07:05:41 -03:00
QualityVan 9abe8f88ce Fixes custom slices not inheriting name (#27343) 2017-05-18 09:51:37 +02:00
WJohn d442e86623 Gives lavaland syndicates the syndicate faction. (#27335)
* Gives lavaland syndicates the syndicate faction.

* Makes the faction a list. Whoops.
2017-05-18 09:50:20 +02:00
QualityVan d66c68cb35 Fixes uplink pens in traitor menu (#27340) 2017-05-18 09:49:30 +02:00
kevinz000 659a5c520f Update aimed.dm 2017-05-17 23:39:44 -07:00
octareenroon91 9bb966c292 Fix choice for golems transferring between shells 2017-05-18 00:18:40 -05:00
Joan Lung 1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
Joan Lung 074727555d Merge pull request #26677 from coiax/codespeak
Codespeak language and manual
2017-05-17 22:04:16 -04:00
Jack Edge aab0e3ad19 STatic lists 2017-05-17 21:53:30 +01:00
Joan Lung 8ecae83c09 If ratvar is alive, turning clockwork floors into clockwork walls is fast 2017-05-17 16:45:16 -04:00
Razharas c152ca21d4 Slight improvement
Slight improvement
2017-05-17 23:31:26 +03:00
Razharas 4826b55686 Merge branch 'anti-transit-vines' of https://github.com/coiax/-tg-station into coiax-anti-transit-vines 2017-05-17 23:23:14 +03:00
AnturK 520ed51f66 Quick fix for AI language issues. 2017-05-17 18:54:46 +02:00
4DPlanner 1270c10082 Hierophant boss deals double damage to intruders 2017-05-17 17:50:24 +01:00
4DPlanner b840d5d551 Nerfs melee damage 2017-05-17 17:07:15 +01:00
4DPlanner 586ec27ac3 Damage is now consistent across lavaland and non-lavaland mobs, and
teleport never friendly fires
2017-05-17 17:05:52 +01:00
4DPlanner 6d756c3dc4 Removes accidental paste nonsense 2017-05-17 16:47:31 +01:00
4DPlanner 07768b376f Buffs hierophant club 2017-05-17 16:36:22 +01:00
Kyle Spier-Swenson 2fc6ce24b4 Update blackbox.dm 2017-05-17 08:28:48 -07:00
oranges 5462d109d2 Merge pull request #27360 from QualityVan/machinevoices
Prepends object names with 'The' in speech
2017-05-17 22:13:42 +12:00
oranges 0e6bd13d34 Merge pull request #27333 from 4dplanner/revenantdeath
Stops people from beating a dead horse (revenant)
2017-05-17 22:03:19 +12:00
oranges c7541703c0 Merge pull request #27321 from francinum/patch-1
Fixes spelling on the EM Pulse action
2017-05-17 22:00:51 +12:00
oranges 30ebadece8 Merge pull request #27302 from coiax/copy-languages-proc
Adds a proc for copying languages from another thing
2017-05-17 21:57:51 +12:00
oranges 8791e04676 Merge pull request #27187 from Cyberboss/patch-83
Allows varediting loc and coords of atom/movables
2017-05-17 21:56:57 +12:00
QualityVan c80f8af206 Prepends object names with 'The' in speech 2017-05-17 05:48:41 -04:00
Jack Edge f8f95ca655 Plastic explosives can no longer be detonated by EMPs
🆑 coiax
balance: Plastic explosives can no longer be detonated by EMPs.
/🆑

> OOC: TheWulfe: Why does an Ion Rifle INSTANTLY kill anyone who
> carries the most common and basic item, the C4?
2017-05-17 10:14:49 +01:00
Militaires 36fa247081 fixes triple latched toolboxes being spawning too often than anticipated (#27285) 2017-05-17 02:01:30 -05:00
Joan Lung 648e83f481 Adds framework for cult constructs having the ability to make runes (#27266) 2017-05-16 20:13:35 -03:00
ShizCalev c4943b2125 Fixes TK butchering after item is gone (#27280) 2017-05-16 20:12:14 -03:00