Commit Graph

69 Commits

Author SHA1 Message Date
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Emmett Gaines
620c1fcbb8 set waitfor in final countdown (#37453) 2018-04-27 13:02:09 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Denton
0ada58dd4f oof 2018-04-11 14:59:54 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
Spirono
29fcf2d5aa Wrench Supermatter Shard to the ground (#36991)
* Temporary concept code for PR

I doubt this code is the standard method of doing things, but trying to understand this code is a bit AIDS

* Using wrench_act() and default_unfasten_wrench() instead

It actually works this time
2018-04-08 16:59:25 -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
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
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
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
vuonojenmustaturska
e849ab23aa Advanced roasting sticks, for cooking sausages (#36071)
* stick

* a commit

* almost forgot something

* seems to compile
2018-03-04 15:41:23 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Dax Dupont
6dc78e0201 SM can explode on space tiles again (#35275)
* Reordered some of the SM logic

* make it a little slower

* It does not explode instantly i tested
2018-02-08 03:13:28 -06:00
CitadelStationBot
18932a5d31 [MIRROR] [s] Fixes clogged vents delamming the supermatter (#5303)
* [s] Fixes clogged vents delamming the supermatter (#35300)

wow forgot to commit thiss to the PR lmao

* [s] Fixes clogged vents delamming the supermatter
2018-02-05 00:51:34 -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
fa3693c00f Merge pull request #34838 from ShizCalev/sm-godmode-fix
Fixes poly's ghost SM spam
2018-01-24 18:08:41 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
Emmett Gaines
9601136df2 sm soundtweak (#33154) 2017-11-30 17:01:29 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
Jalleo
300c471da9 Refactor of base machinery a tiny bit more. DONE (#32546)
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.

* Just checking something

* Does this fix the compiling not working properly?

* And this?

* What is going wrong ugh!

* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?

* Slight tidying up for what Cyberboss and Antur likes.

* Fixes the things that I was asked to fix
2017-11-12 13:19:23 -06:00
LetterJay
141de52658 Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
[MIRROR] Assmos part 1, #2
2017-10-27 02:47:56 -04:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
Emmett Gaines
c7d3696636 Adds ambience to the SM and portable generators (#31945)
* Adds aambience to the SM and portable generators

* lowered pitch of supermatter

* start and end fix
2017-10-25 23:37:14 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
ShizCalev
770a0a1154 Fixes aliums being able to attack the SM crystal 2017-10-01 05:04:30 -05:00
ShizCalev
c54ea1b9bf Fixes SM shard extraction (#31111)
* Fixes SM shard extraction

* Space-OSHA called. They want to have a word.
2017-09-29 18:43:41 -05:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
CitadelStationBot
adc7a52b8d BYPASSES THE DEEP FREEZE (#2168) 2017-07-28 23:51:24 -07:00
CitadelStationBot
54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
CitadelStationBot
da324257fe [MIRROR] Supermatter code cleanup (#1964)
* Supermatter code cleanup

* Delete supermatter.dm.rej

* Update supermatter.dm
2017-07-13 06:38:17 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
b3c3cf7537 Switches SM squawk to report integrity (#1956) 2017-07-10 06:45:06 -07:00
CitadelStationBot
b0cf4a2e37 Removed silicon SM interact message (#1929) 2017-07-07 10:35:55 -07:00
CitadelStationBot
9a4698874f Adds alarm sounds to SM (#1932) 2017-07-07 10:34:58 -07:00
CitadelStationBot
be5ad79fa2 Changes SM integrity rounding (#1925) 2017-07-07 10:33:45 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
83da8141f4 Fixes SM getting energy when hit in space. (#1723) 2017-06-30 18:41:49 -07:00
CitadelStationBot
d1a77ef774 Ports bay's supermatter monitor modular program 2017-06-28 10:05:53 -05:00
CitadelStationBot
94405f5176 Lowers supermatter damage hardcap by 75% to compensate for high speed atmos processing (#1363) 2017-06-04 09:10:35 -07:00