Commit Graph

86 Commits

Author SHA1 Message Date
Dap
9f275ebf01 Ports trim decals
## About The Pull Request

So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.

## Changelog
🆑
add: Trim lines!
/🆑
2019-09-08 10:51:05 -06:00
Dap
f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! 2019-08-25 21:38:04 -06:00
BurgerLua
5bd2f28d69 Removed #C8A5DC 2019-07-12 01:02:43 -07:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
JTGSZ
84016ed3ef Here we go. 2019-05-21 12:30:44 -04:00
deathride58
621b0675e9 Fancy lighting wave 2 - expands nonbinary colored lighting to more than just flashlights and lights 2018-11-16 21:12:07 -05:00
Bear
c6ce774327 what a gas 2018-11-01 22:35:18 -04:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -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
Jordan Brown
7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
Fix some missing icons
2018-05-14 15:13:33 -05:00
deathride58
bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
Jordan Brown
deddd8debe Merge pull request #37622 from ShizCalev/cockarock
Changes cockroach guts to insect guts
2018-05-03 08:42:46 -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
kevinz000
84ac06c986 Yeah no 2018-03-31 04:07:29 -07: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
deathride58
a9b3b0b7f4 Merge branch 'master' into upstream-merge-36242 2018-03-09 20:38:39 +00:00
Qustinnus
68757f1b44 Small moodie balance changes 2018-03-07 22:39:39 -06:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
deathride58
389e2ac804 Update remains.dm 2018-02-05 10:54:43 -05:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot
d4c270fe4a [MIRROR] [READY] Fixes de-initialization of cleanables-ash (#5295)
* [READY] Fixes de-initialization of cleanables-ash

* Update morgue.dm

* Update morgue.dm
2018-02-05 03:20:09 -06:00
CitadelStationBot
662f1904aa [MIRROR] Lavaland bomb runtime fix (#5246)
* Lavaland bomb runtime fix

* Update cleanable.dm
2018-02-05 00:56:37 -06:00
CitadelStationBot
17ccbb4a53 [MIRROR] Adds tiny shards (#5299)
* Adds tiny shards (#35070)

* Adds tiny shards

* .

* .

* .

* .

* .

* .

* Adds tiny shards
2018-02-05 00:53:52 -06:00
CitadelStationBot
8fe05c8171 [MIRROR] Allows blobs to destroy decals (#5279)
* Allows blobs to destroy decals

* Allows blobs to destroy decals
2018-02-04 23:14:15 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Jordan Brown
070a4bc0c4 Merge pull request #34817 from ninjanomnom/stop-pointing-at-me
Makes the point effect not trigger movement code
2018-01-24 06:12:29 -06:00
Jordan Brown
7a6796eb76 Merge pull request #34620 from ShizCalev/color-correction
Corrects tile color defines
2018-01-19 12:24:00 -06:00
deathride58
757dfbbdc5 Ports Aurora's floor tile color turf decals (For mappers) (#34492)
* ports Aurora's floor tile color decals

* replaces aurora's decals with new ones that actually have detail, renames turf_decal/corner to turf_decal/tile

* corner > tile decal
2018-01-18 21:28:14 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Jordan Brown
801eab4c3c Fixes decals being created on bad turfs (#34121)
* Fixes decals being created on bad turfs

* Fix decal check

* squash me daddy
2018-01-07 18:51:09 -06:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
Jordan Brown
505fc95ad0 Merge pull request #34034 from deathride58/goonstylecrayons
Makes crayons draw at the location you click
2018-01-05 09:28:07 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay
1b6b8a7c00 Update cleanable.dm 2017-12-19 17:46:15 -06:00
LetterJay
0a05b499fd Update cleanable.dm 2017-12-19 17:14:57 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
deathride58
ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05:00
WJohn
e8ddae5d98 Cleans up floors.dmi a bit and adds new turf decals. 2017-11-20 20:48:06 -06:00
LetterJay
41b60c6d1e Merge pull request #3845 from Citadel-Station-13/upstream-merge-32441
[MIRROR] Crayon rotation as a type var
2017-11-09 03:18:17 -06:00
LetterJay
a297f4bc7f Update crayon.dm 2017-11-08 02:22:48 -06:00
ShizCalev
88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00
Jordie
5bcaf7a3b1 Crayon rotation as a type var 2017-11-07 08:03:32 -06:00
Emmett Gaines
a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
Kyle Spier-Swenson
927dea03ce Fixes excessive overlay churn (#32065)
* Fixes excessive overlay chern

Adding an overlay on every cross and uncross of every player (with how bloody the station gets this is called on just about every fucking movement, some times multiple times if there are multiple types of stains (oil, blood, alien, etc) is an excessive as fuck amount of chern in the overlay subsystem.

This is likely the cause of overlays being so high.

* I APOLOGIZE FOR NOTHING!
2017-10-25 21:45:46 -05:00