Commit Graph

158 Commits

Author SHA1 Message Date
Persi
4af2eee9dd Haha, okay... this will break Kilo
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
2020-02-23 02:28:18 -05:00
Persi
c4b4a90bd8 Oh hey it's KiloStation
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
2020-02-20 00:58:54 -05:00
kevinz000
dc3e5e24fd Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-25 19:36:06 -07:00
Ghommie
b1a4cc0406 renormalize 2020-01-20 21:17:06 +01:00
Ghommie
5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
kevinz000
5d485a95c3 Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-19 20:25:51 -07:00
Detective Google
2c4daf3a99 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-13 16:32:18 -06:00
kevinz000
8f5d4a0a49 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-12 18:27:03 -08:00
Detective Google
6589065c38 scream 2020-01-12 15:25:51 -06:00
Detective Google
97c26c704d Update Space_Station_13_areas.dm 2020-01-12 15:24:51 -06:00
Detective Google
81d3225819 ? 2020-01-12 15:23:45 -06:00
Detective Google
99ba77ce01 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2020-01-12 15:23:05 -06:00
Detective Google
c7dcd0c8a3 grug hates merge conflicts 2020-01-12 15:19:44 -06:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Detective Google
d5b227a0ca adds the POOL to box station
F in chat for dorms 7.
2020-01-11 23:34:07 -06:00
kevinz000
8e1affa1f5 nightshift changes 2020-01-02 23:56:40 -08:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Ghommie
e1998e1bab set the sub areas fire var before the fire alarms update their icons. 2019-12-12 23:16:06 +01:00
Ghommie
7a3cb3bd58 Oversight. 2019-12-11 19:17:44 +01:00
Ghommie
e35db533fe ready. 2019-12-11 17:48:54 +01:00
Ghommie
bafd03bc19 Mapping. 2019-12-11 12:11:09 +01:00
Ghommie
8ed21b47b6 Grammar and something. 2019-12-10 16:20:57 +01:00
Ghommie
19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +01:00
kevinz000
178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
2019-11-14 16:38:27 -07:00
Ghommie
f55a602319 Unmodularize areas. 2019-11-13 06:13:18 +01:00
Ghommie
9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Persi
db1f459151 Set clockcult teleport in Captain's Quarters to false. 2019-10-12 03:01:52 -04:00
Seris02
59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08:00
Ghom
2845428c03 ports "Improve efficiency of SSmapping init" (#8651) 2019-06-17 11:18:28 -07:00
Ghommie
b5e3da68bd Ports "areas_in_z after start population fix" 2019-06-16 08:45:37 +02:00
kevinz000
1034a6ad0e ball stuff 2018-12-16 03:41:37 -08:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130)
* Transit space refactor

* Update bitfields.dm
2018-06-18 11:51:02 -07:00
oranges
ffd705c8d7 Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay
Replace area-wide fire overlay with reddening the lights
2018-06-11 22:29:10 -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
deathride58
bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326
[MIRROR] Removes SCP_294
2018-04-27 09:35:43 +00:00
Armhulen
17aa0acef8 Removes SCP_294 (#37326)
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
2018-04-25 10:05:57 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -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
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
766b85908e [MIRROR] Adds the Ancient Cloning Lab ruin (#5814)
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
2018-03-05 15:20:49 -06:00
vuonojenmustaturska
7214836012 Merge pull request #35734 from ShizCalev/path-cleanup
Cleans up unused /area paths
2018-02-17 09:39:20 -06:00
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
MMMiracles
2d499b938c adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168)
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
2018-02-07 20:23:32 -06:00
Poojawa
d7f8b8fbe4 dme enabling 2018-01-31 07:17:21 -06:00