Commit Graph

105 Commits

Author SHA1 Message Date
Poojawa
49a2f3cc63 I don't even fucking know anymore 2019-05-12 06:31:02 -05:00
Poojawa
ad5418f0a1 as it turns out, Creatures don't have minds 2019-05-12 04:43:52 -05:00
Poojawa
1a047c0068 I think I got it.
Also gibs should be better too.
2019-05-12 04:06:35 -05:00
Poojawa
fcdc748bf1 u h g. I hate this 2019-05-10 07:07:09 -05:00
Poojawa
88831da8f4 it's the one part that I keep saying I just need to get around to 2019-05-09 14:43:05 -05:00
Poojawa
8af9c6fad9 duplicate definitions? really? wtf 2019-05-09 10:32:14 -05:00
Poojawa
3f6cd92d54 Ok this time all of them are nitpicked 2019-05-09 10:15:51 -05:00
Poojawa
0f02562b51 Fixes Xenomorph blood related travis errors 2019-05-09 09:59:34 -05:00
Poojawa
7b6a65ce3b okay we're starting to pass our blood type to bloodmeme now
STILL JUST FUCKING FOOTSTEPS LEFT THO GOD FUCKING DAMNIT
2019-05-09 08:17:18 -05:00
Poojawa
5a67114d33 get blood id is my foe now. 2019-05-08 04:53:51 -05:00
Poojawa
69eca2ae4b progress, just need to fiddle with footprints again 2019-05-07 13:23:49 -05:00
Poojawa
d14943d4b0 well we have footprints now, xenoblood back to blood subtype. 2019-05-07 05:29:45 -05:00
Poojawa
996662ebea adjust and reset things 2019-05-06 04:35:09 -05:00
Poojawa
6698d9646b go away Travis 2019-04-17 06:32:42 -05:00
Poojawa
c65e551c07 makes travis shutup 2019-04-17 06:01:59 -05:00
Poojawa
a0b7c15e0d whatever Travis, it isn't even enabled, fuck off 2019-04-17 04:52:39 -05:00
Poojawa
fe6407d00c I need to do something else for a bit pending reviews 2019-04-17 04:33:56 -05:00
Poojawa
73098574b7 what to do when footprints are being a bitch.
why, we get rid of them :honk:
2019-04-17 01:18:21 -05:00
Poojawa
f244d3fdca system's mostly working
need to polish out the get_blood_dna_list runtime
2019-04-16 11:30:36 -05:00
Poojawa
f58cc09aed Some slight fixes 2019-04-16 08:53:19 -05:00
Poojawa
a772f532c3 Synthetic and RNG blood 2019-04-16 04:28:04 -05:00
Poojawa
33c41e80c0 pretty sure I'm onto it 2019-04-13 04:33:40 -05:00
Poojawa
03a174d21f compile fixes except we're memes still
why yes, I'm making the bloods all subtypes of each other at this point. I should probably change the way stuff is colored. but, meh. effort.
2019-04-07 08:54:05 -05:00
Poojawa
60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05: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