78265ad51b
Merge pull request #7144 from Citadel-Station-13/upstream-merge-38524
...
[MIRROR] Fix some of the Lavaland roundstart atmos active turfs
2018-06-18 10:10:49 -05:00
a97514965a
Merge pull request #7124 from Citadel-Station-13/upstream-merge-38486
...
[MIRROR] Removes an unused open turf var
2018-06-18 09:50:35 -05:00
27b80045ad
Fix some of the Lavaland roundstart atmos active turfs ( #38524 )
2018-06-17 03:15:08 -05:00
351f43a392
Merge pull request #7113 from Citadel-Station-13/upstream-merge-38500
...
[MIRROR] Fixes attacking wooden walls
2018-06-16 16:17:28 -05:00
3e8168890f
Removes an unused open turf var ( #38486 )
2018-06-16 06:19:37 -05:00
1f3bbebe0a
Moves arch component application to where archdrops is defined ( #38487 )
2018-06-16 06:17:48 -05:00
460bcd399d
Fixes attacking wooden walls ( #38500 )
2018-06-16 06:17:10 -05:00
d875c362fa
[MIRROR] Turf grammar omnibus ( #7104 )
...
* Turf grammar omnibus (#38375 )
* Fix plurality and propriety on turfs
Some turfs are marked tentatively plural in order to avoid an incorrect
choice of "a" or "an".
* Add an article var to handle unusual a/an
* An additional pass on turf names
* Decapitalize server, mainframe, killroom floors
* Turf grammar omnibus
2018-06-13 19:31:29 -07:00
e279392386
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
...
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
9124dac65f
Adds indestructible sandstone wall ( #38350 )
...
* adds sandstone
* OKAY FINE KOR
JEEZ
* I am very angry right now
* you don't seem to understand
* Update closed.dm
2018-06-07 23:16:17 -05:00
bd6fb5f9e5
New directional beach sprites and corners for the 2018 Summer Ball ( #38262 )
...
* Adds beach corners, interior corners, and other sides in addition to the normal down direction.
* SOMEONE LIED TO ME
* Update misc_plating.dm
* don't copy paste at 4am
* okay there we go
2018-06-04 00:47:45 -05:00
3f85ba3724
Merge pull request #6976 from Citadel-Station-13/upstream-merge-38210
...
[MIRROR] Fix reagents being lost when vomit piles combine
2018-06-02 07:31:53 -05:00
6060af1c49
Merge pull request #38210 from AutomaticFrenzy/patch/by-vomit-combined
...
Fix reagents being lost when vomit piles combine
2018-06-01 09:58:50 -05:00
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
4452dc4629
Corrects bronze floor & table's name ( #38164 )
2018-05-31 22:41:01 -05:00
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
06b7cdf27a
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
63aa6eeee6
Update lava.dm
2018-05-22 07:58:44 -05:00
359d31238d
Merge branch 'master' into upstream-merge-37486
2018-05-21 11:59:57 -05:00
931a950adb
Merge branch 'master' into upstream-merge-37486
2018-05-21 08:59:32 -05:00
0758204515
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
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
b111088140
Fixes meteors hitting qdeleted stuff. ( #37840 )
...
* Fixes meteors hitting qdeleted stuff.
* I made a typo in one line change, time to die.
* Better solution ?
2018-05-16 12:06:06 -05:00
5e48fcd275
Merge pull request #37846 from DaxDupont/axe-time
...
Small cult nerf do not be alarmed robustin think about your heart
2018-05-16 04:46:59 -05:00
bc6fbeb9fe
Adds (fake) ambient occlusion as a client preference
2018-05-07 22:08:08 -05:00
50f8779fc0
Merge branch 'master' into upstream-merge-37486
2018-05-06 07:15:48 +00:00
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
55566461c6
Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565
...
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
2018-05-02 13:59:14 +00:00
1675490652
Modifies component transfer to make ChangeTurf able to transfer components
2018-04-30 21:16:48 -05:00
a9d452a24d
Merge pull request #37549 from ShizCalev/bounce_away-fixes
...
Resolved var name conflict for bounce_away()
2018-04-30 12:51:40 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
f373b2c9e6
Kills off three more flags from flags_2
2018-04-29 17:30:55 -05:00
3f6167d08e
Moves several clothing-specific flags from /atom to their proper type
2018-04-28 13:21:48 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
cc6b320f83
game folder
2018-04-23 00:17:28 -05:00
930c9bf58c
Merge pull request #6459 from Citadel-Station-13/upstream-merge-37281
...
[MIRROR] Removes old decal system
2018-04-22 02:46:25 -05:00
a465733b1c
Removes old decal system ( #37281 )
2018-04-19 05:45:25 -05:00
44df2b780e
Merge pull request #37268 from ShizCalev/scp-ruin-fix
...
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
2018-04-18 11:34:06 -05:00
6b3a59b028
Merge pull request #6372 from Citadel-Station-13/upstream-merge-37117
...
[MIRROR] Removes some duplicated code
2018-04-14 07:45:15 -05:00
8e293a20aa
Update asteroid.dm
2018-04-12 07:04:33 -05:00
5af97c3edc
Removes some duplicated code
2018-04-11 15:01:10 -05:00
f45a552c42
Code improvements on bullet damage decals ( #36604 )
...
Now fixing the dents is instant too
Maybe fixes #36601
2018-04-11 05:21:03 -05:00
e0d7630c19
Merge branch 'master' into synctesting
2018-04-09 21:43:26 +00:00
d0075b37b3
Fixes a turf runtime ( #37038 )
2018-04-08 19:22:14 -05:00
5fa001c10f
things with stuff ( #6233 )
...
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
2d710e863f
Archaeology... .... Code Cleanup (One day I promise!) ( #36490 )
...
* Improves Arch Code
* defines and stack_traces null values
* relocates 2 defines to "non-signal" section
2018-04-02 18:14:15 -05:00
16896254cf
Merge pull request #36888 from Robustin/initatmos
...
Removes unecessary compares in turf atmos init
2018-04-02 08:33:48 -05:00
7826515aed
Walls made entirely of wood! ( #36524 )
...
* Buffs Lifebringers (And kind of botany.)
* Retools staff to use earthsblood as fuel, can now remove rock walls
* No more blessings!
* Dismantle the means of production.
2018-04-01 12:24:33 -05:00
adf4786470
Merge pull request #36617 from ShizCalev/logging-cleanup
...
Improves some logging legibility
2018-03-28 12:17:32 -05:00
30e5e7a56a
[MIRROR] Fixes regression with pulled objects and space transitions ( #6065 )
...
* Fixes regression with pulled objects and space transitions (#36587 )
* Fixes spesspulling
* honk
* Fixes regression with pulled objects and space transitions
2018-03-22 06:09:55 -05:00
LetterJay