Commit Graph

13853 Commits

Author SHA1 Message Date
Razharas 52ce383102 Merge pull request #13053 from AnturK/doors
Makes staff of doors create random mineral doors.
2015-11-20 06:54:28 +03:00
Nerd Lord d1bcc9d0de Blobs now have jaunt. 2015-11-19 21:41:45 -05:00
octareenroon91 d2fa527045 Add numbers and star graffiti to crayon/spraycan designs. 2015-11-19 17:24:09 -06:00
Cheridan 4c899d2b34 Merge pull request #13063 from Incoming5643/subtypesof
Adds subtypesof(path)
2015-11-19 16:31:09 -06:00
bgobandit 179a7831a5 ID consoles no longer strip non-standard access. 2015-11-19 16:13:05 -05:00
Tkdrg cabd151252 Fixes changeling swap body kicking people to lobby
Don't set the ckey after transfer_to(), as tranfer_to() will have nulled
that field for the source mob.

Fixes #13107
2015-11-19 18:04:36 -03:00
Cheridan 1edef8ac6a Merge pull request #13068 from tkdrg/rollitbaby
Fixes roller bed teleportation exploit
2015-11-19 14:38:29 -06:00
AnturK 01eaa6901e Adds Dominators to PoI list 2015-11-19 21:04:32 +01:00
Incoming5643 4a2b1e0e4e implying implicitness 2015-11-18 22:39:48 -05:00
bgobandit 2fd13edef2 Adds hivelord stabilizer. Fixes a bug. 2015-11-18 22:04:01 -05:00
as334 d97dffaf57 unfucking shit ass plasma memes part 3 2015-11-18 20:58:05 -05:00
bgobandit 899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
2015-11-18 19:55:06 -05:00
GunHog e555811830 The Hand Tele now displays the target name.
The Hand Tele will now display the target's name before teleporting.
2015-11-18 18:35:57 -06:00
bgobandit 47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
Remie Richards 7333bede43 Merge pull request #13055 from Anonus/actionbuttons
Gives constructs action buttons, adds cool effects to cult turfs.
2015-11-18 20:26:47 +00:00
Nerd Lord 9437d6fc27 BETTER workaround. 2015-11-18 15:21:04 -05:00
Remie Richards e9ac6d50f2 Updates Hologram code to use AltClick, Lazykor.jpg 2015-11-18 19:05:38 +00:00
Yolopanther f767524d3e Proper formatting of the notifications. 2015-11-18 00:52:16 -08:00
Cheridan cba8a9a325 Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix
Conflicts:
	code/modules/mob/mob.dm
2015-11-18 01:44:29 -06:00
kingofkosmos a121b9308c Removes unneeded restrained-warnings and one canUseTopic-check. 2015-11-18 06:08:31 +02:00
Yolopanther 922df5f02c Single loop and looks nice. 2015-11-17 19:06:31 -08:00
PKPenguin321 e106d255df fountains give godblood instead of omnizine
makes fountains give godblood instead of omnizine to bypass the OD issues with omnizine
2015-11-17 18:14:31 -08:00
as334 c98a7a0d7e Fixes merge conflicts, also a minor slipup with flags 2015-11-17 20:59:43 -05:00
as334 160506b401 Unfucking shit ass plasma memes part 2 2015-11-17 20:38:56 -05:00
PKPenguin321 4604dabd88 fixes typo in nexus description
Fixes #13084

just throwing this in here since it's in the same .dm as the current fix and it's only one line so what could go wrong
2015-11-17 16:13:45 -08:00
PKPenguin321 e4b87f66e0 HoG fountains now give omnizine instead of DD
doctors delight has piss-poor healing properties since goofball nerfed it to death, and also drains your nutrition unless you're a doctor. not a very good chem for a fountain designed to heal you. 20u of omnizine wont overdose you and will heal a very decent amount.
2015-11-17 15:09:29 -08:00
Incoming a7a6a599d8 Makes my oldcode mindswap book work like my slightly less oldcode summon events mass mindswap event to remove some copypasta and fix #13054 2015-11-17 15:33:54 -05:00
kingofkosmos 38e5420832 Removes can_use -proc from PDA.dm and replaces all instances of it with canUseTopic.
Adds kingofkosmos to admins.txt
2015-11-17 21:26:42 +02:00
Nerd Lord a183e0474d Pooling is good for the soul. 2015-11-17 11:27:26 -05:00
AnturK b1bf6acab0 Changes spellbook description
Picks types from list
2015-11-17 15:17:46 +01:00
Yolopanther 12c7d7a90d Now only loops through the content of the box once instead of twice. 2015-11-17 04:46:25 -08:00
Yolopanther 93b5ef000c replacing broken lights with broken lights since 1999 2015-11-16 23:21:08 -08:00
Yolopanther 082538240e Haha indentation fixes. 2015-11-16 19:40:26 -08:00
Yolopanther 0437176bee Allows light replacer to be refilled with box of lights 2015-11-16 19:35:03 -08:00
Razharas b3ed636d3c Merge pull request #13034 from kingofkosmos/shardspacenoslip
Stops glass shards from hurting you in space
2015-11-17 05:33:15 +03:00
Tkdrg 292ba6c046 Fixes roller bed teleportation exploit
Thanks swankcookie for reporting this to me ingame.
2015-11-16 22:30:26 -03: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
Tkdrg 92e2dc1b2b Fixes antag huds disappearing on transfer_to()
I am retarded please merge asap
2015-11-16 19:53:33 -03: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
kingofkosmos 62987c0716 Enables putting an ID into a PDA when the PDA not in your inventory. 2015-11-16 20:41:11 +02:00
MrStonedOne c784ca902e Ports /vg/'s asset cache system; lowers interface lag when clients connect.
Byond will queue all browse(), browse_rsc(), and winset() calls to the client, to ensure they load in order, and ensure any resources from a browse_rsc call (css/html/js) are already at the client by the time any html windows loads.

How ever, each file is processed separately, and byond will wait for the reply from the client before it will send the next file.

Our current system sends all of these html resource files to the client at once when they connect, this is the sole cause of the lag when a client connects. Byond will not send the client a file it already has, but it has to ask the client first, and it does so one file at a time, waiting for a reply from the client before sending the next one down the pipe.

This system fixes that.

Basically it works like this:
Client connects: nothing happens, no massive queuing of browse_rsc() calls, so no interface delay
Client opens a asset_cache controlled html based interface
Asset cache gets notified by the html based interface what assets the client needs to have.
Asset cache checks to see if it's sent that client those files.
Asset cache sends the missing ones, adding them to the list of assets the client has.

This basically spreads out the delay to when you first open a window that uses resources, where it is much more manageable.

I've kinda done a halfass port without too much thought, I see some room for improvement to better fit /tg/'s coding style and make the system more flexible. I'm PRing this because if I don't, it will never get finished.

PDAs and html_interface has been imported in to the new system lazily to test. at 100ms connection start interface lag went from 35 seconds to 16 seconds. Nanoui hasn't been imported, and once it is, that should drop down to almost nothing.

I'll work on this some more after some sleep.
2015-11-15 23:49:05 -08:00
Cheridan fe369f268b Merge pull request #13029 from optimumtact/patch-2
Fixes admin message about borg lockdown
2015-11-15 20:59:46 -06:00
Razharas e9dae3be88 Merge pull request #13015 from SuperSayu/Holodecker
Holodeck Upgrades [MAP]
2015-11-16 04:51:49 +03:00
KorPhaeron 668521f195 Fixes reflector layer 2015-11-15 19:40:46 -06:00
Vincent faf5ddaceb Holodeck refactor and Enchancements
Moves holodeck code to modules/holodeck.  Repaths holodeck structures a little.  Cleans holodeck code and prepares for additional features (multiple holodecks, etc).  Should fix #4828.

Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.

All items spawned by the holodeck will do only stamina damage, except when emagged.  This allows emergency medical to be staffed with scalpels and bonesaws and such.  Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05: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
duncathan salt 3860981936 Merge pull request #13025 from tkdrg/imdumb
Improves antag_hud transfer_to() logic
2015-11-15 15:59:51 -06:00
duncathan salt 7f48bf70f5 Merge pull request #13027 from tkdrg/FUK
Pickup() improvements
2015-11-15 15:59:05 -06:00
NikNakFlak cf9b0dde3c I did this for you Incompetence 2015-11-15 14:51:51 -07:00
duncathan salt 59802d119a Merge pull request #12976 from tgstation/revert-12831-idedplsnerf
Revert "nerfs water"
2015-11-15 14:24:16 -06:00