8b9ef1e400
Game folder
2018-09-11 04:06:45 -05:00
ac6fddcfb3
Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync
2018-07-05 00:17:44 -04:00
0500be9b35
[MIRROR] Fixes some shard harddel stuff. ( #7299 )
...
* Fixes some shard harddel stuff. (#38799 )
* Fixes some shard harddel stuff.
2018-07-02 06:44:50 -07:00
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
4452dc4629
Corrects bronze floor & table's name ( #38164 )
2018-05-31 22:41:01 -05:00
2bcfe00283
Fix some inconsistencies relating to resting
2018-05-25 10:56:47 -05:00
cc6b320f83
game folder
2018-04-23 00:17:28 -05:00
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
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
dd55ad6f88
Merge pull request #36079 from deathride58/nerfstheskylarlinemanexperience
...
[S] Fixes tables being bluespace magnets
2018-03-17 07:53:20 -05:00
e1823e1a40
[MIRROR] You can now non-violently place people on tables ( #5891 )
...
* You can now non-violently place people on tables (#36150 )
* You can now non-violently place people on tables
2018-03-10 07:43:14 -06:00
a96a28f3d6
[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
2018-03-07 20:49:25 -06:00
8fe572acde
Merge pull request #36054 from AutomaticFrenzy/patch/fancy-tables-2
...
Fix placement of fancy tables in the editor
2018-03-03 00:31:27 -06:00
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
78708a3582
[MIRROR] Fix icon of black fancy table in editor ( #5735 )
...
* Fix icon of black fancy table in editor
* Fix icon of black fancy table in editor
2018-02-28 19:41:44 -06:00
749f8c4e5c
[MIRROR] Revert "Mekhi goes on the table" ( #5715 )
...
* Merge pull request #35980 from kevinz000/revert-35661-patch-483
Revert "Mekhi goes on the table"
* Revert "Mekhi goes on the table"
2018-02-26 02:38:53 -08:00
eaab8a687c
tabling people on brass tables makes a clanging sound ( #35876 )
...
* tabling people on brass tables makes a sound
* fixes syntax
* more syntax fixes
2018-02-22 14:32:25 -06:00
f9353da855
Quote the armor lists
2018-02-16 00:26:26 -06:00
e95d3cd700
Merge pull request #35661 from MrStonedOne/patch-483
...
Mekhi goes on the table
2018-02-15 10:38:37 -06:00
72ff7be9bd
code folder. 221 files changed wew
2018-02-12 21:03:40 -05:00
53ce73528a
Buffs tablepushing ( #5222 )
...
* Buffs tablepushing
* review
2018-02-04 23:26:43 -06:00
1d729e7d6d
Merge pull request #34316 from tgstation/Cyberboss-patch-4
...
Fixes poker tables not being deleted after Narsie touches them
2018-01-12 12:30:15 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
237f0fa8db
Lowers rack layer to 2.8 ( #33069 )
2017-11-25 09:21:02 -06:00
571985ca5d
Merge pull request #32864 from ike709/dir
...
Fixes some computer dirs
2017-11-19 22:42:28 -06:00
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
baf8b578f5
Removes mapping error bandaid ( #31710 )
...
* Removes mapping error bandaid
* Update conversion code
2017-10-15 21:02:02 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
25cf971fef
Merge pull request #31275 from kingofkosmos/moredeconhints
...
Adds deconstruction hints to various things
2017-10-04 16:33:51 -05:00
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
0bc0d643ab
[MIRROR] Fixes rack parts progress bar ( #2737 )
...
* Fixes rack parts progress bar
* Update tables_racks.dm
2017-09-13 22:49:23 -05:00
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
1da785ffb5
Removes old height parameter from CanPass proc
2017-07-13 17:46:36 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
7dcb2fa68e
Update tables_racks.dm
2017-06-14 08:30:25 -05:00
bd4d42a8a6
upstream-merge-28034/compile fix/upstream-merge-28048
2017-06-11 08:12:27 -05:00
Poojawa