Commit Graph

361 Commits

Author SHA1 Message Date
CitadelStationBot
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
deathride58
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
CitrusGender
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
CitrusGender
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
LetterJay
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
Jordan Brown
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
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
ShizCalev
4452dc4629 Corrects bronze floor & table's name (#38164) 2018-05-31 22:41:01 -05:00
deathride58
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
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
63aa6eeee6 Update lava.dm 2018-05-22 07:58:44 -05:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJay
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJay
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
AnturK
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
vuonojenmustaturska
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
deathride58
bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
deathride58
50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
deathride58
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
Jordan Brown
1675490652 Modifies component transfer to make ChangeTurf able to transfer components 2018-04-30 21:16:48 -05:00
Jordan Brown
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
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturska
f373b2c9e6 Kills off three more flags from flags_2 2018-04-29 17:30:55 -05:00
vuonojenmustaturska
3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
LetterJay
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
Emmett Gaines
a465733b1c Removes old decal system (#37281) 2018-04-19 05:45:25 -05:00
Jordan Brown
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
LetterJay
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
LetterJay
8e293a20aa Update asteroid.dm 2018-04-12 07:04:33 -05:00
ninjanomnom
5af97c3edc Removes some duplicated code 2018-04-11 15:01:10 -05:00
nicbn
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
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
vuonojenmustaturska
d0075b37b3 Fixes a turf runtime (#37038) 2018-04-08 19:22:14 -05:00
Poojawa
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
Grandmother of 50
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
Jordan Brown
16896254cf Merge pull request #36888 from Robustin/initatmos
Removes unecessary compares in turf atmos init
2018-04-02 08:33:48 -05:00
fludd12
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
vuonojenmustaturska
adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup
Improves some logging legibility
2018-03-28 12:17:32 -05:00
CitadelStationBot
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
CitadelStationBot
c8c7e6575b [MIRROR] fixes "Xeno acid melts lava" (#6063)
* fixes "Xeno acid melts lava" (#36584)

* fix

* im dumb

* fixes "Xeno acid melts lava"
2018-03-22 06:08:51 -05:00
CitadelStationBot
dad2d44ea2 [MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)
* [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)

cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.

* [READY] Several fixes/changes to mood, longterm mood effects, beauty component
2018-03-19 21:33:18 -05:00
CitadelStationBot
009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
CitadelStationBot
1fd5de5bfe [MIRROR] Fixes stacks and material containers, fixes wet floors (#6008)
* Fixes stacks and material containers, fixes wet floors (#36497)

* Fixes stacks and material containers, fixes wet floors
2018-03-19 21:06:33 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 07:53:11 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
CitadelStationBot
64abde83eb [MIRROR] Cult Fixes and Minor Balance Tweaks (#5913)
* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks
2018-03-12 07:01:54 -05:00