LetterJay
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -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
LetterJay
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
LetterJay
c0a467c2fc
Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415
...
[MIRROR] Nightmare
2017-09-12 23:31:38 -05:00
oranges
f2adac2a9a
Merge pull request #30631 from AnturK/literallyfasterthanlight
...
Fixes shuttle lighting issues
2017-09-12 17:10:42 -05:00
LetterJay
caca1d1794
Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553
...
[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-12 01:22:11 -05:00
LetterJay
f60d57520b
Merge branch 'master' into upstream-merge-29839
2017-09-11 23:22:39 -05:00
LetterJay
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
LetterJay
935ae98f4a
Merge branch 'master' into upstream-merge-29839
2017-09-11 18:03:51 -05:00
LetterJay
914cc38a2d
Merge pull request #2676 from Citadel-Station-13/upstream-merge-30515
...
[MIRROR] Added warnings for ultrasafe and safe security modes
2017-09-11 17:54:18 -05:00
KorPhaeron
4d2fe460ed
Nightmare
2017-09-11 16:23:47 -05:00
LetterJay
01920e5fea
Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220
...
[MIRROR] Adds Archaeology Component
2017-09-11 15:22:59 -05:00
LetterJay
7cdd5eaa02
Update admin.dm
2017-09-11 14:22:23 -05:00
LetterJay
24dd22aff5
Update components.dm
2017-09-11 14:10:27 -05:00
LetterJay
74a163db23
Merge pull request #2553 from Citadel-Station-13/upstream-merge-30252
...
[MIRROR] Server tools versioning and fix to displayed testmerges
2017-09-11 13:12:10 -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
ExcessiveUseOfCobblestone
f63a75b137
Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-10 17:08:36 -05:00
Jordan Brown
eaeaae7bef
Added warnings for ultrasafe and safe security modes ( #30515 )
2017-09-09 19:39:52 -05:00
Jordan Brown
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
ExcessiveUseOfCobblestone
33f36fd0de
Adds Archaeology Component
2017-09-08 10:02:01 -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
31102d0ec4
Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
...
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
LetterJay
17db844180
another mirror rebase for the PRMirror being down
2017-09-06 17:32:49 -05:00
Poojawa
9bca718151
Fixes prey digestion noises and loop ( #2616 )
2017-09-05 12:53:35 -05:00
Poojawa
5f1d88ffeb
Revert "[MIRROR] Port material containers to datum components" ( #2597 )
...
* Revert "sprite fix on kitsune tails"
This reverts commit 44d5b21a43#2591 )"
This reverts commit 7f46280d6b#2590 [ci skip]"
This reverts commit 201e07033f#2590 )"
This reverts commit 5c98b9a13b#2587 )"
This reverts commit 92e055be97#2557 [ci skip]"
This reverts commit 241a10d88d#2557 )"
This reverts commit d959b7538a#2562 )"
This reverts commit 32300086d5
2017-09-04 09:07:40 -05:00
LetterJay
92e055be97
Quick sync ( #2587 )
...
* sync since the mirror was down
* fucking byond
* can't forget these
2017-09-04 04:38:49 -05:00
CitadelStationBot
32300086d5
[MIRROR] Port material containers to datum components ( #2562 )
...
* Port material containers to datum components
* Fixes Rej
2017-09-04 04:08:42 -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
CitadelStationBot
9b00f12ba0
Makes the shuttle code a little bit more robust by removing a snowflake loop ( #2559 )
2017-09-04 01:36:00 -05:00
LetterJay
3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
LetterJay
e310435892
UI objects should PIXEL_SCALE
2017-09-02 05:26:22 -05:00
CitadelStationBot
50b88388da
Crew monitoring rework part 1: crew pinpointers
2017-08-30 17:03:20 -05:00
kevinz000
0925cb108b
wew
2017-08-29 22:09:42 -07:00
CitadelStationBot
1caba77431
Server tools versioning and fix to displayed testmerges
2017-08-29 17:16:17 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
CitadelStationBot
94429bdccc
Cleaned up environment_smash vars with bitflag defines ( #2515 )
2017-08-27 05:55:07 -07:00
CitadelStationBot
4c4bd22578
[MIRROR] Some more tweaks to Geis ( #2487 )
...
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
2017-08-27 01:36:17 -07: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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
CitadelStationBot
4961966552
|SPECIES FOOD PREFERENCES| ( #2232 )
...
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
2017-08-21 20:23:30 -07:00
CitadelStationBot
196c9d0597
Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
2017-08-20 06:01:24 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
