Commit Graph

169 Commits

Author SHA1 Message Date
oranges 41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
CitadelStationBot 170f5d7a5e [MIRROR] Log file for PDA messages (#2848)
* log file for pda messaegs (#30827)

* Log file for PDA messages
2017-09-19 06:34:53 -05:00
CitadelStationBot 4dd0dc9d66 [MIRROR] Various grammar fixes (#2842)
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
2017-09-17 22:35:51 -05:00
CitadelStationBot 08083581c3 [MIRROR] (Hopefully) Lessens preferences and manifest injection lag (#2796)
* (Hopefully) Lessens preferences and manifest injection lag

* Update datacore.dm

* Update preferences_setup.dm
2017-09-17 11:59:40 -05:00
CitadelStationBot 119828bb59 [MIRROR] Fixes get_area not working on areas (#2788)
* Fixes get_area not working on areas

* Fixes get_area not working on areas
2017-09-15 05:52:39 -05:00
CitadelStationBot 9a4f84da5e [MIRROR] Refactors roundstart centcom threat report. (#2739)
* Refactors roundstart centcom threat report.

* Update blob.dm

* Update changeling.dm

* Update traitor_chan.dm

* Update sandbox.dm

* Update traitor.dm
2017-09-13 22:50:01 -05:00
LetterJay 1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
Kyle Spier-Swenson 3da71799ab Garbage collection tweaks and refactors. (#30118)
* Garbage collection queuing rewriting

* Some Tweaks

* Fixes some queue tracking oddities

* More tweaks

* Remove the middle two queue steps. tis was a silly idea

* New logging.

We store logging datums for use in tracking the stats of shit qdeleted

Added logging for destroy time as well as hard delete time, per type. As well as a few others

* Fix compile for testing

* Does the cyberboss

* does the antur
2017-09-13 01:47:12 -05:00
KorPhaeron d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
JJRcop 00dd2f283b Adds Internet admin midi (#30457)
* Adds Internet admin midi

* Moves global regex into proc (shell_url_scrub)

* Moves shelleo to world
Adds quotes around the command in shelleo, to encapsulate it

* Admins can stop playing web sounds

* Revised internet midi extension order
Moved m4a to least preferred,
as it can potentially carry non-aac or non-mpeg-3 audio

* Kills \n in web sound

* play_web_sound availability based on config

* play web sound and shelleo tweaks

istypeless for in play web sound & readability parenthesis around binary AND
add return index defines for shelleo proc

* Security fix for play web sound
2017-09-08 09:32:29 -05:00
LetterJay 17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00
Poojawa 8767fa299b Fixes headpatting *wag and Vore spaceworthiness (#2582)
* no you're not supposed to die in a gut

* Re added tailwagging when patted

* adjust sounds, adding belly noises mode

* lowers sounds.

* Adds Noisy belly mode
2017-09-04 02:47:39 -05:00
kevinz000 0925cb108b wew 2017-08-29 22:09:42 -07:00
LetterJay 27750d91d6 Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214
[MIRROR] Removes the suppose-to-be unused shuttle wall path
2017-08-28 09:01:47 -05:00
LetterJay 47aa97b847 Merge pull request #2523 from Citadel-Station-13/upstream-merge-30207
[MIRROR] Adds separate log for sql errors with no config check
2017-08-28 09:00:19 -05:00
CitadelStationBot 12ff0e7406 Removes the suppose-to-be unused shuttle wall path 2017-08-28 02:20:45 -05:00
CitadelStationBot ed1a06a9ed Adds separate log for sql errors with no config check 2017-08-28 02:20:16 -05:00
CitadelStationBot 7d15048221 file2list passes the file thru trim() 2017-08-28 02:19:54 -05:00
kevinz000 c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
LetterJay 85a10be496 Merge pull request #2221 from Citadel-Station-13/upstream-merge-29523
[MIRROR] Makes GetComponent() faster using typecache magic
2017-08-18 14:16:44 -05:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot 90e1bbd3e1 Megafauna will now always show up in the orbit list 2017-08-16 01:01:06 -05:00
LetterJay 0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
CitadelStationBot 3d83b55cf6 Annihilates the colons! 2017-08-15 10:49:55 -05:00
LetterJay bfbc3e198c Merge branch 'master' into upstream-merge-29523 2017-08-14 08:30:40 -05:00
CitadelStationBot bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
LetterJay c00f0a99f0 Merge pull request #2335 from ktccd/Flavor-elevator
Refactored flavortext to be savable in DNA. (RIP old changeling-meta-hunting)
2017-08-12 06:35:45 -05:00
ktccd 9ef1825ee0 Adds Taur cocks (#2329)
* Added flared taur penises

FIRST STEP ONLY DO NOT PULL REQUEST THIS!!!!
The files are still messy and the penis is just another shape to choose
from right now for testing purposes!
Flipped the order of GENITALS_BEHIND_LAYER and BODY_BEHIND_LAYER, as
taurs need to be drawn on top of the genitalia, and I don't think
anything else uses this that would need genitals drawn on top of them.

* Adds More shapes

Adds Tapered and Knotted shapes to the Taur cocks.

* Fixes on-ground sprites

The OLD bug barbed knotted cocks being invisible when not inside a body
is fixed.
This fix solves why taur cocks were invisible when cut off or gibbed the
body.
This also removes the lowershape() workaround that was being used.
I'll get around a bigger refactor of other genitalia in another PR, as
the scope of this was just to add taur cocks to begin with...
2017-08-11 12:29:01 -07:00
ktccd 62a7d4301f Refactored flavortext.
Flavortext is now stored in DNA features and can thus be stolen by
changelings and restored by cloners/pods/etc.
Also added genitals_use_skintone to the random features proc, 'cause it
was missing (my bad, I was even newer at messing with DNA back then :S).
2017-08-11 20:13:01 +02:00
CitadelStationBot cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
LetterJay b25c5d5acc Merge pull request #2283 from Citadel-Station-13/upstream-merge-29732
[MIRROR] Freon now simply uses a color matrix rather than blending an icon
2017-08-07 07:22:47 -05:00
LetterJay ee772f52d6 Merge pull request #2273 from Citadel-Station-13/upstream-merge-29697
[MIRROR] Rewrites incorrect documentation for the pickweight() proc
2017-08-07 07:20:26 -05:00
CitadelStationBot 5242663885 Freon now simply uses a color matrix rather than blending an icon 2017-08-06 12:42:08 -05:00
CitadelStationBot e95ddfaf94 Rewrites incorrect documentation for the pickweight() proc 2017-08-06 03:09:47 -05:00
CitadelStationBot 0eea5ad53d Improves Tesla Performance 2017-08-06 03:07:38 -05:00
CitadelStationBot f5bc18bb55 buildmode fix + blueprints fix (#2261)
* Fixes Admin Buildmode Mass-Deletion making people nude, gives GetAllContents() an ignore typecache.

* sync turf.dm
2017-08-04 11:46:11 -07:00
CitadelStationBot d4f15ff6da [MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039)
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
2017-08-03 06:12:27 -07:00
CitadelStationBot 7cfcd1ec15 fixes astar and windoors 2017-08-02 05:22:18 -05:00
CitadelStationBot 8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot a2e487c86e Makes GetComponent() faster using typecache magic 2017-08-01 16:59:50 -05:00
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
LetterJay 3be62f3ccd Update _lists.dm 2017-07-31 17:33:13 -05:00
LetterJay 576ef2510c Merge branch 'master' into upstream-merge-29367 2017-07-31 17:19:31 -05:00
LetterJay bb4a98937f Merge pull request #2071 from Citadel-Station-13/upstream-merge-29363
[MIRROR] Fix missing keyword argument syntax in typecache_filter_list
2017-07-31 17:14:38 -05:00
LetterJay aedd22090b Update _lists.dm 2017-07-31 15:40:52 -05:00