Commit Graph

67 Commits

Author SHA1 Message Date
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Useroth 848f3910e6 Oops. Now it compiles fine. 2019-05-28 09:32:59 +02:00
Useroth eb6e710b18 Forgot to uncomment the clown check on the shoes. 2019-05-28 09:17:03 +02:00
Poojawa 8bcfeff15d Fixes bloody shoes effect 2018-10-09 18:02:02 -05:00
Poojawa 729790f9d3 Overhauls some code, double checks uniforms 2018-09-28 03:54:57 -05:00
Poojawa e4cdb0c853 Merge branch 'master' into override-override 2018-09-28 01:49:35 -05:00
Poojawa 4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
Poojawa 5982f5c67c Ensures Shoes are updated 2018-09-26 08:59:48 -05:00
Poojawa 865b6a5b3a Finished code 2018-09-26 08:59:48 -05:00
Poojawa a4810b6666 some code before I ran out of time at work 2018-09-26 08:59:48 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay 359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -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
Fox McCloud f5031bc4f7 Fixes Several Machines Materials Insertion (#37432)
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
2018-05-04 04:40:56 -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 5518efebea everything but mob stuff 2018-04-23 01:06:17 -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
Poojawa f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -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 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 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
deathride58 082d36fa6b Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459
[MIRROR] Clown Ops
2018-03-17 23:58:15 +00: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
Cruix b4457dfefd Clown Ops 2018-03-17 07:52:41 -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
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 75b038511c [MIRROR] Alternative PR to brass apples: Adds bronze sheets (#5758)
* Alternative PR to brass apples: Adds bronze sheets (#35874)

* Adds bronze sheets

* nope!

* Alternative PR to brass apples: Adds bronze sheets
2018-03-02 20:07:39 -06:00
Jordan Brown f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
MrDoomBringer 4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
oranges 269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
CitadelStationBot cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
ShizCalev 6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
Jordan Brown d0789ecaf9 Splits clothing.dm in 7 other files 2017-10-21 19:01:30 -05:00
CitadelStationBot d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
Tad Hardesty 01ecdff51a Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
XDTM 7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
vuonojenmustaturska 1aef27a0f0 Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at (#30967)
* Jump boots fix

* requested changes

* Requested changes, also whoops
2017-09-26 04:29:18 -05:00
CitadelStationBot 8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847)
* New squeaky datum and plushes

* Update bananashoes.dm
2017-09-22 19:43:56 -05:00
Poojawa 573a81a4d9 Reapplies material componets 2017-09-22 09:31:39 -05:00
Poojawa 0eb8cf0235 Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)
* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.
2017-09-16 04:29:22 -05:00
Poojawa 5f1d88ffeb Revert "[MIRROR] Port material containers to datum components" (#2597)
* Revert "sprite fix on kitsune tails"

This reverts commit 44d5b21a43.

* Revert "Update vg_clothing_packs.dm (#2591)"

This reverts commit 7f46280d6b.

* Revert "Automatic changelog generation for PR #2590 [ci skip]"

This reverts commit 201e07033f.

* Revert "[MIRROR] Gives the detective a mass spectrometer (#2590)"

This reverts commit 5c98b9a13b.

* Revert "Quick sync (#2587)"

This reverts commit 92e055be97.

* Revert "Automatic changelog generation for PR #2557 [ci skip]"

This reverts commit 241a10d88d.

* Revert "Decreases hacked ai module cost (#2557)"

This reverts commit d959b7538a.

* Revert "[MIRROR] Port material containers to datum components (#2562)"

This reverts commit 32300086d5.
2017-09-04 09:07:40 -05:00
CitadelStationBot 32300086d5 [MIRROR] Port material containers to datum components (#2562)
* Port material containers to datum components

* Fixes Rej
2017-09-04 04:08:42 -05: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
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00