vuonojenmustaturska and letterjay
83ac5852dd
Turn /datum.isprocessing into a datum flag ( #38193 )
2018-06-05 18:00:21 -05:00
deathride58 and GitHub
963ad5dce9
Merge pull request #6983 from Citadel-Station-13/upstream-merge-38238
...
[MIRROR] Fixes pda style loading
2018-06-05 21:23:53 +00:00
LetterJay and GitHub
5997b69de1
Merge pull request #6995 from Citadel-Station-13/upstream-merge-38240
...
[MIRROR] Replaces airlock_controller/incinerator related varedits with defines/subtypes
2018-06-05 12:11:34 -05:00
MrDoomBringer and letterjay
678e429dbf
Adds a Supplypod-delivery admin smite ( #38069 )
...
* wa la
* oop forgot an icon
* buildmode compatibility
* ok
* makes centcompod default
* CentCom pods fall faster and are capatilized right
* yike
* yike2
* FASTER
* white space and default icon state
* spacemaniac thanks
2018-06-04 00:37:24 -05:00
81Denton and letterjay
0d42b1c4d1
Replaces airlock_controller/incinerator related varedits with defines/subtypes
2018-06-03 11:03:14 -05:00
Ling and letterjay
49bd6e24fb
Fixes pda style loading
2018-06-03 09:02:42 -05:00
deathride58 and kevinz000
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
CitadelStationBot and kevinz000
d62cb31e9b
[MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile ( #6884 )
...
* Delete some duplicate macro definitions
* sql changelog changes ping the host
* Templates the caravan ambush ruin shuttles
* Update CODEOWNERS
* Update components.dm
* Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile
* Initial Placeholder
* Update caravanambush.dmm
2018-05-27 19:27:56 -07:00
CitadelStationBot and kevinz000
7bb6bc8dd3
[MIRROR] HoP/QM have access to vault ( #6818 )
...
* Vault Access for QM (#37880 )
* HoP/QM have access to vault
* Update captain.dm
2018-05-27 17:25:18 -07:00
deathride58 and kevinz000
6ac830a123
Combat rework adjustments (Making use of 512's new filter feature, small balance tweaks, and more) ( #6092 )
...
* makes use of 512's filters, adds combat mode toggle component signals, and more
* Update phantomthief.dm
* Update living.dm
2018-05-27 17:18:40 -07:00
CitadelStationBot and kevinz000
270d71d095
[MIRROR] New Trait: Drunken Resilience ( #6926 )
...
* New Trait: Drunken Resilience (#38076 )
* drunk healing
* balance, bugfix
* more consistent wording
* removed random chance and tweaked values
* rounding values
* 0 to FALSE, slightly lowered top values
* New Trait: Drunken Resilience
2018-05-27 17:16:43 -07:00
LetterJay and GitHub
69af2087aa
Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631
...
[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
2018-05-27 01:32:02 -05:00
vuonojenmustaturska and letterjay
1d1dc1aca8
Disallow effects from being scanned by the chameleon projector ( #38017 )
...
* henk
* iseffect
2018-05-25 07:38:01 -05:00
LetterJay and GitHub
b89254ced7
Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448
...
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-24 11:58:57 -05:00
LetterJay and GitHub
de44ac926e
Merge branch 'master' into upstream-merge-37665
2018-05-23 10:14:10 -05:00
LetterJay and GitHub
e7d9cd0698
Merge branch 'master' into upstream-merge-37597
2018-05-23 05:21:19 -05:00
LetterJay and GitHub
3666ec9878
Merge pull request #6574 from Citadel-Station-13/upstream-merge-37530
...
[MIRROR] Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use
2018-05-23 05:18:15 -05:00
cyclowns and letterjay
f37865ee6c
Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision ( #37631 )
...
add: Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.
tweak: Analyzers now show temperature in kelvin as well as celsius.
tweak: Analyzers now show total mole count, volume, and mole count of all gases.
tweak: Analyzers show everything at slightly higher degrees of precision.
More accurate and advanced analyzers have been something that I think atmos and toxins mains have been wanting for a while now (including myself). It's always a pain to have to manually add 273.15 to every celsius temperature, or have to use outside tools or VV (which isnt usable in actual games) to calculate mole count for a gas mixture. Not to mention, the ability to analyze things like volume pumps and gas filters makes it easier to manage larger atmos setups. This is just a QoL change for people in any of those jobs. In fact, most players probably don't even know what the fuck is a mole is so adding mole readout to analyzers is a good way to get people to understand atmospherics better.
2018-05-22 22:11:23 -05:00
LetterJay and GitHub
06b7cdf27a
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
LetterJay and GitHub
6a575f19d1
Merge branch 'master' into upstream-merge-37597
2018-05-22 07:21:53 -05:00
LetterJay and GitHub
467819beba
Update flags.dm
2018-05-22 07:20:27 -05:00
LetterJay and GitHub
c1aab03bb5
Merge branch 'master' into upstream-merge-37530
2018-05-22 07:19:06 -05:00
LetterJay and GitHub
adf1505c70
Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486
...
[MIRROR] Moves several clothing-specific flags from /atom to their proper type
2018-05-22 07:18:34 -05:00
LetterJay and GitHub
01fc8cf128
Merge pull request #6555 from Citadel-Station-13/upstream-merge-37293
...
[MIRROR] Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again
2018-05-22 07:17:41 -05:00
oranges and letterjay
c27d97a6e5
Merge pull request #37934 from AutomaticFrenzy/patch/ssping
...
Migrate goonchat pings to a subsystem
2018-05-21 16:40:29 -05:00
LetterJay and GitHub
359d31238d
Merge branch 'master' into upstream-merge-37486
2018-05-21 11:59:57 -05:00
LetterJay and GitHub
6489ef5511
Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476
...
[MIRROR] Uppercases slot defines.
2018-05-21 11:23:02 -05:00
LetterJay and GitHub
931a950adb
Merge branch 'master' into upstream-merge-37486
2018-05-21 08:59:32 -05:00
LetterJay and GitHub
39365437f5
Merge branch 'master' into upstream-merge-37293
2018-05-21 08:53:17 -05:00
LetterJay and GitHub
6060df5b92
Merge pull request #6554 from Citadel-Station-13/upstream-merge-37267
...
[MIRROR] Adds log and management tabs to permissions panel
2018-05-21 08:42:21 -05:00
LetterJay and GitHub
0758204515
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
LetterJay
ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
ShizCalev and letterjay
49bf67ed1d
Updates BYOND links to use HTTPS ( #37918 )
...
* Updates BYOND links to use HTTPS
* revert
* if -> If
2018-05-20 15:31:28 -05:00
kevinz000 and letterjay
d54667c81b
[READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-19 18:51:51 -05:00
deathride58 and GitHub
649314c455
Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429
...
[MIRROR] Update DMAPI to version 3.2.1.0
2018-05-17 18:14:54 +00:00
ShizCalev and letterjay
a7f13f15cf
Fixes Adminorazine killing ash lizards ( #37872 )
...
* Fixes Adminorazine killing ash lizards
* this should do it...
2018-05-17 10:24:59 -05:00
LetterJay and GitHub
173d4fadae
Update subsystems.dm
2018-05-15 09:06:36 -05:00
Jordie and letterjay
68fcab96a5
Splits up round table initialize, start, end and shutdown
2018-05-15 02:12:50 -05:00
LetterJay and GitHub
0877bdd4e5
Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646
...
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-15 00:47:59 -05:00
LetterJay and GitHub
ca86c93e70
Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406
...
[MIRROR] Adds (fake) ambient occlusion as a client preference
2018-05-13 11:52:23 -05:00
LetterJay and GitHub
37f972dc6c
Update obj_flags.dm
2018-05-13 10:17:36 -05:00
LetterJay and GitHub
e1fef511cf
Update flags.dm
2018-05-13 10:17:28 -05:00
LetterJay and GitHub
289cbbb375
Merge pull request #6718 from Citadel-Station-13/upstream-merge-37697
...
[MIRROR] Makes the redirect component able to transfer with changeturfs
2018-05-13 03:28:57 -05:00
LetterJay and GitHub
80aad142a4
Merge branch 'master' into upstream-merge-37406
2018-05-13 03:28:37 -05:00
LetterJay and GitHub
f21cac1af2
Merge pull request #6700 from Citadel-Station-13/upstream-merge-37399
...
[MIRROR] Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-12 17:04:23 -05:00
Emmett Gaines and letterjay
b036b1e519
Makes the redirect component able to transfer with changeturfs ( #37697 )
2018-05-12 16:29:28 -05:00
deathride58 and GitHub
37b9d589ad
Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396
...
[MIRROR] Track admin observer time
2018-05-11 03:45:11 +00:00
deathride58 and GitHub
7acf54f5fc
Update misc.dm
2018-05-10 23:37:20 -04:00
kevinz000 and letterjay
3819a5a9b5
Fixes EMPs ( #37656 )
2018-05-10 01:33:25 -05:00
Tad Hardesty and letterjay
111ad79eab
Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-09 22:44:57 -05:00