Commit Graph
394 Commits
Author SHA1 Message Date
deathride58andGitHub e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
kevinz000andGitHub cd38bccf01 why 2018-04-08 19:40:28 -07:00
Poojawaanddeathride58 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
Jordan BrownandCitadelStationBot eb5936c48b Merge pull request #36927 from 81Denton/moff-name-variety
Adds more moth names to prevent duplicate random names
2018-04-03 22:02:47 -05:00
MrDoomBringerandCitadelStationBot b87addc531 adds a sprite to the "show roundend report" button (#36875)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* bingo bongo i dont wanna leave the congo i REFUSE to go

* wjhon approval
2018-04-01 21:51:08 -05:00
LetterJayandGitHub dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548
[MIRROR] Added a new ability to sentient diseases
2018-04-01 19:50:43 -05:00
LetterJayandGitHub 954027e16d Merge branch 'master' into upstream-merge-36722 2018-04-01 17:44:41 -05:00
LetterJayandGitHub f9d963a634 Update _lists.dm 2018-04-01 04:40:47 -05:00
LetterJayandGitHub 24d4b310cd Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147
[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
2018-04-01 01:01:55 -05:00
LetterJayandGitHub 4e095cec40 Merge pull request #6181 from Citadel-Station-13/upstream-merge-36811
[MIRROR] Removes a unused helper
2018-03-31 18:40:36 -05:00
LetterJayandGitHub fa64b72ea6 Merge pull request #6180 from Citadel-Station-13/upstream-merge-36781
[MIRROR] Get_Flat_Human_Icon no longer draws asses that nobody wants
2018-03-31 18:39:15 -05:00
LetterJayandGitHub 5fe5f34692 Merge pull request #6172 from Citadel-Station-13/upstream-merge-36679
[MIRROR] Fixes round-end report not generating sometimes.
2018-03-31 06:21:58 -05:00
LetterJayandGitHub 018fa05f01 Merge pull request #6155 from Citadel-Station-13/upstream-merge-36554
[MIRROR] Adds config to allow ranks only from txt
2018-03-31 06:17:58 -05:00
LetterJayandGitHub 71af2a9bc5 Merge pull request #6154 from Citadel-Station-13/upstream-merge-36477
[MIRROR] Science goggles detect grenade reagents
2018-03-31 06:17:37 -05:00
LetterJayandGitHub 9cf0b857db Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617
[MIRROR] Improves some logging legibility
2018-03-31 06:17:11 -05:00
CruixandCitadelStationBot 0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -05:00
JalleoandCitadelStationBot fb28072ef3 Removes a unused helper (#36811) 2018-03-31 06:13:59 -05:00
RobustinandCitadelStationBot b26868a6b7 Get_Flat_Human_Icon no longer draws asses that nobody wants (#36781)
* Argument to limit excess icon work

* 50% less icon for your icon

* 75% less icon for your icon

* Correction

* statics the list, tweaks a default arg

* Cardinal argument list

* correct GLOB name
2018-03-31 06:13:28 -05:00
JordieandCitadelStationBot 2aae805c1d Fixes round-end report not generating sometimes. (#36679)
* fixes some non-minded mobs breaking roundend report

* actually a better handling
2018-03-29 05:03:26 -05:00
Tad HardestyandCitadelStationBot b871285655 Fix 512-only code in recent conveyor belt fix 2018-03-29 04:41:27 -05:00
Jordan BrownandCitadelStationBot 4629039c38 Adds config to allow ranks only from txt 2018-03-28 13:01:41 -05:00
yoriiandCitadelStationBot 130337797d Science goggles detect grenade reagents (#36477)
* Science goggles detect grenade reagents

* reversed output

* minor improvements

* new helper for counting stuff

* spelling fixes
2018-03-28 12:18:18 -05:00
vuonojenmustaturskaandCitadelStationBot adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup
Improves some logging legibility
2018-03-28 12:17:32 -05:00
Ashe HiggsandCitadelStationBot 8ec16df2e4 Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)
* Adds some more traits

* April Fools' heirlooms

* Fixes the detective sound

* Refactor to use signals
2018-03-28 12:15:06 -05:00
arsserpentariumandCitadelStationBot 303272319a [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 11:01:22 -05:00
Ziiroandkevinz000 b70381c89e Adds IPC Antennas (#6049) 2018-03-24 12:33:19 -07:00
CitadelStationBotandPoojawa 92c868a829 [MIRROR] Prevents overriding shuttle areas (#6081)
* Prevents overriding shuttle areas

* Prevents overriding shuttle areas
2018-03-22 19:33:43 -05:00
kevinz000andCitadelStationBot 9eb6eb6225 [READY] ~SPELL CARDS~, homing projectiles, and more! 2018-03-22 15:40:07 -05:00
Poojawa f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
Poojawa b27c5cd3b0 Revert "SCREEE. fuck this. I'mma just revert at this point, but don't want to lose progress."
This reverts commit a2fbab5ccb.
2018-03-19 05:32:12 -05:00
Poojawa a2fbab5ccb SCREEE. fuck this. I'mma just revert at this point, but don't want to lose progress. 2018-03-19 04:57:57 -05:00
Poojawa 796e22beac LOCAL SUNE PORTS... OH GOD WHAT HAPPENED
That feel when you're in the 'Oh, well while I'm here...' mindset.
2018-03-18 09:02:13 -05:00
orangesandCitadelStationBot 9ea4bd45c2 Merge pull request #36432 from ShizCalev/braindamageeventruntime
Fixes brain damage json runtime
2018-03-17 07:54:04 -05:00
PoojawaandGitHub 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
CitadelStationBotandPoojawa 4f3115cfbe [MIRROR] Play Internet Sound sanity checks (#5918)
* Play Internet Sound sanity checks (#36080)

* Play Internet Sound sanity checks

Now checks if the content URL uses http(s) before playing

* HTML is not HTTP: renames regex

* Converted global regexes to procs that return them

* Revert "Converted global regexes to procs that return them"

This reverts commit 2eedbd6982b0c4de943a72c94f92f9d75001c06e.

* Play Internet Sound sanity checks
2018-03-12 07:04:43 -05:00
deathride58 936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58andGitHub 1387c8e3b6 Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858
[MIRROR] Mushroom people, revived!
2018-03-09 18:37:29 +00:00
deathride58andGitHub 28f886791d Update mobs.dm 2018-03-08 01:01:42 -05:00
ArmhulenandCitadelStationBot e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06:00
QustinnusandCitadelStationBot a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
Poojawa fcc038c41a defines, helpers, globalvars 2018-03-06 21:05:15 -06:00
PoojawaandGitHub 86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
PoojawaandGitHub 6e5131cfc5 Vore code to json and more (#5789)
* Vore 2.0

Initial commit

* double checked porting

* Fixes compile issues

* converts Ash Drake bellies to new system

digs out lingering datum/belly stuff too

* Let's just work on this later

* System operational

* Update preferences.dm
2018-03-06 03:59:31 -06:00
CitadelStationBotandPoojawa a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
CitadelStationBotandPoojawa 30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788)
* Clean up all sorts of crap, mostly defines

* fixes compile errors
2018-03-05 13:23:28 -06:00
CitadelStationBotandPoojawa 1a4d8b94a1 [MIRROR] Halves server file access cooldowns (#5812)
* Halves server file access cooldowns (#36139)

* Lets me actually browse logs properly

* admins get to spam harder

* Halves server file access cooldowns
2018-03-05 12:29:50 -06:00
CitadelStationBotandPoojawa 59d61d5e0d [MIRROR] [READY]Circuit balance (#5760)
* [READY]Circuit balance

* [READY]Circuit balance (#35931)

* cooldowns, power cell,disks

* NUMBERS NUMBERS NUMBERS

* 1 8 9

* PR PR PR

* DESC DESCDSCDCC

* <br>

* GET ALL CONTENTS

* Update power.dm

* Update power.dm

* Update time.dm
2018-03-02 20:05:28 -06:00
CitadelStationBotandPoojawa d4f08c37a7 [MIRROR] When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works. (#5752)
* Merge pull request #35966 from kevinz000/patch-452

When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works.

* When not being used for display purposes, station time will not respect timezone offset, because honestly the only reason it's there in station time is so time2text or whatever works.
2018-03-02 18:36:39 -06:00