8ef3861b0b
[MIRROR] New squeaky datum and plushes ( #2847 )
...
* New squeaky datum and plushes
* Update bananashoes.dm
2017-09-22 19:43:56 -05:00
d0274da310
[MIRROR] Click signals ( #2903 )
...
* Merge pull request #30924 from ninjanomnom/click-signals
Click signals
* Click signals
2017-09-22 18:59:17 -05:00
573a81a4d9
Reapplies material componets
2017-09-22 09:31:39 -05:00
54bd982d6b
Merge pull request #2787 from Citadel-Station-13/upstream-merge-30681
...
[MIRROR] Prevents the creation of Shadowzombiechangelings
2017-09-22 08:43:37 -04:00
aec48daa0a
Ashdrake noms ( #2868 )
...
* Initial commit
* probably a better way to check this
* It compiled boys. Let's see if it works.
* IT WAS ALL NULLS, BOYS
* Hooray, it's not broken anymore boys!
* Well it works, but we need transfer IDs to work
locating them post-initialize would help, probably. Then assigning their
links soon after.
* Bellies linked, autotransfer, LoseTarget
* half-thought sanity check needs to go away
* A few last minute tweaks.
2017-09-21 06:29:08 -05:00
79d769532f
Update DNA.dm
2017-09-19 11:18:22 -05:00
ecce4cf138
[MIRROR] New DCS signals ( #2741 )
...
* New DCS signals
* Update atoms.dm
* actually ports comsigs
2017-09-19 07:00:08 -05:00
19309d76d0
Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344
...
[MIRROR] Traitorbro gamemode
2017-09-18 08:35:00 -04:00
d5c012d431
Update role_preferences.dm
2017-09-17 22:38:03 -05:00
a4310ec6a6
Update atom_hud.dm
2017-09-17 22:37:44 -05:00
d0c9f79a37
[MIRROR] Makes building with plasma glass a thing. ( #2820 )
...
* Makes building with plasma glass a thing. (#30800 )
* Makes building with plasma glass a thing.
* Updated grille.dm
* Makes building with plasma glass a thing.
2017-09-17 22:22:50 -05:00
a01f3213f5
Traitorbro gamemode
2017-09-17 18:03:12 -05:00
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
d104c1d76c
Prevents the creation of Shadowzombiechangelings
2017-09-15 03:08:07 -05:00
82861d208b
[MIRROR] Fixes lighting hard deleting ( #2760 )
...
* Fixes lighting hard deleting (#30684 )
* Fixes lighting hard deleting
2017-09-14 06:44:17 -05:00
9031a1b671
[MIRROR] Soft crit slowdown for all carbons ( #2743 )
...
* Soft crit slowdown for all carbons
* Update carbon_movement.dm
* Update carbon_movement.dm
* Update species.dm
* actually pay attention to spacings
2017-09-13 21:29:50 -05:00
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
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
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
c0a467c2fc
Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415
...
[MIRROR] Nightmare
2017-09-12 23:31:38 -05:00
f2adac2a9a
Merge pull request #30631 from AnturK/literallyfasterthanlight
...
Fixes shuttle lighting issues
2017-09-12 17:10:42 -05:00
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
f60d57520b
Merge branch 'master' into upstream-merge-29839
2017-09-11 23:22:39 -05:00
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
935ae98f4a
Merge branch 'master' into upstream-merge-29839
2017-09-11 18:03:51 -05:00
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
4d2fe460ed
Nightmare
2017-09-11 16:23:47 -05:00
01920e5fea
Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220
...
[MIRROR] Adds Archaeology Component
2017-09-11 15:22:59 -05:00
7cdd5eaa02
Update admin.dm
2017-09-11 14:22:23 -05:00
24dd22aff5
Update components.dm
2017-09-11 14:10:27 -05:00
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
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
f63a75b137
Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-10 17:08:36 -05:00
eaeaae7bef
Added warnings for ultrasafe and safe security modes ( #30515 )
2017-09-09 19:39:52 -05:00
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
33f36fd0de
Adds Archaeology Component
2017-09-08 10:02:01 -05:00
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
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
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
17db844180
another mirror rebase for the PRMirror being down
2017-09-06 17:32:49 -05:00
9bca718151
Fixes prey digestion noises and loop ( #2616 )
2017-09-05 12:53:35 -05:00
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
92e055be97
Quick sync ( #2587 )
...
* sync since the mirror was down
* fucking byond
* can't forget these
2017-09-04 04:38:49 -05:00
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
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
9b00f12ba0
Makes the shuttle code a little bit more robust by removing a snowflake loop ( #2559 )
2017-09-04 01:36:00 -05:00
3e0ead1204
Merge branch 'master' into upstream-merge-29105
2017-09-02 07:11:32 -05:00
e310435892
UI objects should PIXEL_SCALE
2017-09-02 05:26:22 -05:00
CitadelStationBot