Commit Graph

9249 Commits

Author SHA1 Message Date
Leo
eaab4f5012 Merge pull request #25206 from octareenroon91/patch-39
Fix ecig chem consumption
2017-03-18 15:26:02 -03:00
Cheridan
46da9d2b81 Merge pull request #25011 from PKPenguin321/flashdark
Adds flashdarks
2017-03-17 17:09:27 -05:00
Cheridan
544b41e1e5 Merge pull request #25180 from ExcessiveUseOfCobblestone/penoriented
THIS STUPID PEN PR FINALLY IS FINISHED GAH
2017-03-17 17:04:53 -05:00
octareenroon91
6384b1a240 Update cigs_lighters.dm
Cause cigs/ecigs to consume chemicals whether or not the owner can absorb them.
2017-03-17 12:08:48 -05:00
Cyberboss
ca070c5efa Fixes being able to move certain spawnpoints (#25135) 2017-03-17 15:03:15 +01:00
Iamgoofball
099c822b7c RCD refactor (#25154)
* Refactors RCD code
2017-03-17 00:22:22 -03:00
Joan Lung
5917e1ffae You can now place lights on shuttles (#25142)
* You can now place lights on shuttles

* apcs don't go there

* this should really be a proper decon
2017-03-16 19:18:25 -05:00
ExcessiveUseOfCobblestone
7b34c5e20f AFTER A MILLENIA 2017-03-16 18:15:33 -04:00
Joan Lung
0cf2e02bb6 Red and green energy swords have much less saturated light colors (#25118) 2017-03-16 20:25:51 +13:00
MrPerson
db34a1f2be Merge branch 'master' of https://github.com/tgstation/-tg-station into revert_revert_revert_come_on_revert_please_rever_please_shit_REVERT_JESUS_TAPDANCING_CHRIST_REVERT_YOU_FUCKING_PIECE_OF_GODDAMN_PISS
Conflicts:
	code/_onclick/hud/plane_master.dm
	code/modules/lighting/lighting_object.dm
2017-03-15 18:53:09 -07:00
oranges
9aaff6e281 Fixes sinks giving misleading messages when containers full (#25037)
* Sinks will now give a message when the reagent holder is full

This also adds a helpful proc to check a reagent holder is full

* It was one character
2017-03-15 16:38:33 -04:00
Tokiko1
bf85ff2327 Adds new gas interactions to supermatter, new minor and major failures and rebalances (#24785)
* Adds new gas interactions to supermatter.
Adds new minor and major failures to supermatter.
Adds highpressure windows to box.

* Shard now announces critical power and critical mass.

* Balance adjustments, some test stuff.

* Higher mole hot setups now scale in damage because they are harder to heat. Low mole setups, like the roundstart shard now cause less damage because they heat up smaller amounts of gas faster.

Actually made windows heat resistant now.

The supermatter crystal now takes damage from heat much earlier.

* Testing and tweaking more stuff.
Added tesla_zap proc.
Added anomaly generation.
Added occasional gravity pull in.

* Fixes anomaly spawner, hopefully fixes lightning bolts.

* Fixes supermatter lightning. Tweaks and balances some more values.

* Resolves conflicts for real now.

* Adds high pressure windows to the supermatter in box, meta and delta.
Fixed supermatter shutter button requiring atmos id on box and meta.
Readded the missing electrical supplies and welding locker to engineering of metastation.
Fixed stuff for travis.

* More balancing and behaviour changes.

* Adds heat_resistance to windows so windows can now survive more than TOC+1600 K if desired.
Also makes high pressure windows able to withstand 50000° K.

* More overcharge tweaks.

* Makes stuff compile and removes extra whitespaces.

* Even more tweaks.

* Rebalances power increase from matter, removes mass paper radiation exploits. Nerfs plasma. Removes mapchanges for the time being.

* Adds high pressure windows to the supermatter engine in box, meta and delta.

* Merge conflicts.

* Requested changes.

* Fixes supermatter zap overriding src.

* Fixes message timing.
2017-03-15 16:23:56 -04:00
octareenroon91
c4d42e8a8a Allow reflector construction (#25084)
New reflector frames can now be built at will.
2017-03-14 20:46:56 -04:00
Cyberboss
a2ddba07d9 Kills a spawn (#25109) 2017-03-14 20:43:55 -04:00
Cyberboss
6688af1523 Fixes more missing qdel hints (#25110) 2017-03-14 20:42:04 -04:00
Joan Lung
b81d5f1f66 Clockwork grilles no longer provide CV (#25072) 2017-03-14 16:15:30 -04:00
Cyberboss
bc89a41028 Fixes the seed_vault not returning a qdel hint (#25040) 2017-03-14 19:33:35 +01:00
Kyle Spier-Swenson
99002e25a3 Fixes lighting of pixel shifted objects and reverts the hacky memleak fix + other lighting fixes (#24963)
* Revert "Lighting micro optimizations and fixes (#24939)"

This reverts commit 78bbbfe20a.

* vg refactor stage 1

* Fix runtime in get_turf_pixel

* fix lighting on turfs

* Fix certain things reading light levels wrong.

* Made SS faster/better by making it split its tick allotment up between it's 3 tasks

* istypeless loops @pjb3005

/proc/typed_loop    6.826        6.830        6.858       190761
/proc/typeless_loop 5.582        5.586        5.620       190435

* lazy init lists
2017-03-14 19:27:23 +01:00
PKPenguin321
5250df594e Lattices now require wirecutters to deconstruct (#25019) 2017-03-13 20:48:55 -04:00
Cheridan
742fcf0ffe Merge pull request #25044 from ChangelingRain/unbuff
Removes a ridiculous accidental buff to glowshroom spreading
2017-03-13 19:10:40 -05:00
Cheridan
856583d6c5 Merge pull request #24989 from jughu/honeybum<3
Lets you carry honey in plant bags
2017-03-13 14:33:29 -05:00
Cyberboss
012eaec1b9 Mob Initialization (#24840)
* Mob Initialization

* new_player Repath

* Fix the dme

* Fix the shit

* Fix a loc

* Fix another loc

* But, in my haste, I forgot the cola!

* Another loc

* ANOTHER LOC

* Further docs

* Where'd that s come from

* Fix shit

* Better
2017-03-13 20:21:12 +01:00
AnturK
dedfa0d236 Fix for windows being uinteractable. (#24994)
* Fix for windows being uinteractable.

* None define
2017-03-13 22:07:23 +13:00
coiax
cb38468e0c Merges HEADBANGPROTECT and EARBANGPROTECT into new secondary flag (#24881)
Unless we get a clothing item that can be worn on the head, and the
ears, and only protects from loud noises in one of the configurations,
this isn't going to be an issue.

Frees up another flag slot, all hail the secondary flags.
2017-03-13 22:00:43 +13:00
coiax
f1d1e6f5e9 Demotes HANDSLOW to secondary flag (#24878)
It's used in literally four places, it doesn't need a high speed
bitflag slot.
2017-03-13 21:59:48 +13:00
coiax
f096307c20 Generates messages when xeno eggs are delivered (#24852)
* Generates messages when xeno eggs are delivered

🆑 coiax
add: The egg spawner on Metastation will generate a station message and
inform the admins if an egg is spawned. (It's only a two percent chance,
but live in hope.)
/🆑

Metastation has a 2% egg spawner. If it picks the xeno egg, it does so
silently, telling no one. Now it informs the station and also admins and
the game log.

To reiterate, this behaviour is already in the map, I'm just generating
logging and messages. If admins want to simulate this, they can spawn a
`/obj/effect/spawner/xeno_egg_delivery` in any location they like.

* Xeno delivery makes a command report instead

I also refactored command report to avoid the duplication of the SECRET
COMMAND REPORT announcement.
2017-03-13 21:58:20 +13:00
coiax
abdbf9e4c5 Adds cyan glowsticks (#25015)
🆑 coiax
add: Glowsticks can now be found in "Swarmer Cyan" colors.
/🆑

because apparently adding the colour cyan to swarmers was too potential
to cause meta or some shit idk
2017-03-13 03:26:04 -04:00
Joan Lung
25ad77898c that didn't do anything 2017-03-12 23:37:20 -04:00
Joan Lung
360fc27428 this too 2017-03-12 23:33:54 -04:00
Joan Lung
18c2b0e2e0 Removes a ridiculous accidental buff to glowshroom spreading 2017-03-12 23:32:48 -04:00
MrPerson
589b4ce8ae Revert "Revert "Human nightvision""
This reverts commit c0ef5e59f7.

Conflicts:
	code/_onclick/hud/ghost.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/plane_master.dm
	code/modules/lighting/lighting_system.dm
	config/config.txt
2017-03-12 19:04:20 -07:00
Iamgoofball
66ae31b0be Adds the Tomb of the Unknown Employee (#25003)
* Adds a Memorial for ArcLumin to Central Command. RIP my friend

* Adds the Tomb Of The Unknown Spaceman

* eh

* arclumin.dm -> memorial.dm

* fixes

* Update Centcomm.dmm
2017-03-13 14:50:12 +13:00
Cyberboss
9a9fd29e04 Cleans some stuff up concerning the new latejoin spawns (#24948)
* Fixes mobs picking from an empty loc list

* Fixes latejoin chairs failing to GC

* More robust arrival shuttle latejoin warnings
2017-03-13 11:35:41 +13:00
Cyberboss
42cac918a8 Ports /obj/structure/window to Initialize (#24945) 2017-03-13 11:34:27 +13:00
AnturK
e5b964f11e Fixes stack splitting (#24941)
* Fixes stack splitting

* Integrates other bugfix in this
2017-03-13 11:34:15 +13:00
AnturK
f85ce64bf1 Updates jammer (#24975) 2017-03-12 16:13:35 -04:00
Mike Long
f36feb87b5 Lordpidey devil fixes (#24693)
* Devils made via event can no longer ascend.

Admins can control whether or not a devil may ascend via traitor panel.

* Adds logging

* Fixes #21326,     Fixes #21321

* Fixes compile error, removes dead code.

* Moves logging to where it's supposed to be.

* Arch devils can now destroy walls with pitchfork.

* Fixes compile error.

* Summon dancefloor can't be used to break down walls.

* Improves disco floor wall check

* Fixes traitor panel for devils.

* refactors human attack_hand

* Fixes compile error

* Devils now respawn with clothes.
2017-03-12 20:55:36 +01:00
coiax
196406210c Glowing goo glows green (#24981) 2017-03-12 09:16:40 -04:00
PKPenguin321
72571786f1 adjusts darklight range/power values 2017-03-11 18:22:34 -08:00
PKPenguin321
0cb1d0e7a8 Adds flashdarks
- Tweaks lightlight code to make light power a var
- Adds code and sprites for flashdarks
2017-03-11 17:15:54 -08:00
Cyberboss
31de7874b5 Fix some shit with the comfy chair (#24944) 2017-03-11 13:09:50 -05:00
jughu
03886f7d43 Update bags.dm 2017-03-11 18:00:04 +01:00
Lexorion
e5e4101f45 gives the bag of holding unique inhands (#24985)
* gives the bag of holding unique inhands

* improves south sprite
2017-03-11 11:17:57 -05:00
Cheridan
4418958f94 Merge pull request #24911 from Supermichael777/Box-meme
Removes the singularity beacon kit from the traitor bundle list.
2017-03-11 02:51:12 -06:00
Joan Lung
f2649ef7fa Refactors window construction a little (#24842) 2017-03-11 17:07:45 +13:00
oranges
26f0845a30 Merge pull request #24846 from KorPhaeron/pdalight
Undoes /vg/ sabotage of PDA lights
2017-03-11 17:07:03 +13:00
AnturK
c65da5a494 Adds radio jammer (#24667)
* Adds radio jammer

* Garbling stands out less now
2017-03-11 17:05:44 +13:00
Xhuis
7db2a60c31 Adds support for weapons with reach (#24395)
* Adds support for weapons with reach

* Fixes reach functionality

* Deletes the dummy object once it's done

* Removes debug code

* doot doot
2017-03-11 17:00:43 +13:00
Joan Lung
7041654243 Removes His Grace ascension (#24909) 2017-03-10 22:36:02 -05:00
Joan Lung
7fa907ed81 Adds Shadowshrooms as a glowshroom mutation (#24898)
* Adds Shadowshrooms as a glowshroom mutation

* why the fuck would I do that
2017-03-11 05:18:43 +03:00