shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,778 Commits 5 Branches 0 Tags
2fd45f4eebf7e140aa8c4f4977ffbd704fefdf64
Commit Graph

318 Commits

Author SHA1 Message Date
LetterJay
ce98f9c444 Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785 
[MIRROR] Replaces loose tech storage boards with spawners
 2018-05-15 06:53:25 -05:00
Jordan Brown
3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
Jordan Brown
7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons 
Fix some missing icons
 2018-05-14 15:13:33 -05:00
LetterJay
ca86c93e70 Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406 
[MIRROR] Adds (fake) ambient occlusion as a client preference
 2018-05-13 11:52:23 -05:00
LetterJay
ee9e96106e Merge pull request #6717 from Citadel-Station-13/upstream-merge-37742 
[MIRROR] spellig fix
 2018-05-13 03:28:39 -05:00
LetterJay
80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00
LetterJay
cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558 
[MIRROR] Anomaly Armour Research
 2018-05-12 21:36:51 -05:00
Armhulen
56eab7e394 Fix spelling in mime forcefield description (#37742) 
* SPELL IT RIGHT REEEEEEEEEEEEEEEEE

* Awhile
 2018-05-11 17:30:58 -05:00
YPOQ
f459f909c0 Fixes anomalies not listening on the correct frequency 2018-05-09 22:45:09 -05:00
KorPhaeron
cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
deathride58
bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
Jordan Brown
deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -05:00
Jordan Brown
d47b71cf23 Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER 
H.O.G.A.N. lawset
 2018-05-01 15:40:09 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
ShizCalev
79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -05:00
vuonojenmustaturska
bc68ed8536 Merge pull request #37125 from 81Denton/shuttle-window-name 
Shuttle window spawner name fix
 2018-04-12 06:37: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
deathride58
1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560 
[MIRROR] [READY]AI latejoins
 2018-04-08 02:25:10 +00:00
deathride58
71344ce953 Merge pull request #6281 from Citadel-Station-13/upstream-merge-36975 
[MIRROR] Removes a sound
 2018-04-07 00:54:31 +00:00
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
vuonojenmustaturska
aaf3bb66cf Merge pull request #36994 from 81Denton/window-spawner-names 
Fixes window spawner names
 2018-04-06 00:44:16 -05:00
Jordan Brown
7cddf61b94 Merge pull request #36975 from KorPhaeron/sound2 
Removes a sound
 2018-04-06 00:43:56 -05:00
kevinz000
4fb2e612df Fixes bloodbath effects not working on people in crit (#36598) 
Also some minor improvements to performance by caching the nearby mobs list once
 2018-04-03 22:01:59 -05:00
kevinz000
84ac06c986 Yeah no 2018-03-31 04:07:29 -07: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
kevinz000
2dcaf50d07 Fixes ghost portal teleportation (#36438) 
* Forced teleportation by portals

* Update portals.dm
 2018-03-17 08:22:46 -05:00
deathride58
a9b3b0b7f4 Merge branch 'master' into upstream-merge-36242 2018-03-09 20:38:39 +00:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58
aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070 
[MIRROR] Beacons are no longer radios
 2018-03-09 18:41:05 +00:00
Qustinnus
68757f1b44 Small moodie balance changes 2018-03-07 22:39:39 -06:00
Armhulen
e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06: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
Dax Dupont
72e3ffa562 Beacons are no longer radios (#36070) 
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
 2018-03-07 14:43:25 -06:00
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815) 
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
 2018-03-05 15:20:59 -06:00
Buggy123
3350d145f8 Makes blood rage more clear (#36095) 
* Makes blood rage more clear

* Makes blood contract more clear

* Fixes minor span class error.
 2018-03-04 17:33:44 -06:00
Jordan Brown
c5f3aa7043 Merge pull request #35793 from DaedalusGame/naksu-pls 
Fixes up foam and smoke code and comments again to atleast be correct
 2018-02-19 22:07:44 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
Jordan Brown
6f60dd1591 Merge pull request #35418 from kevinz000/patch-445 
Allows projectiles to pass portals
 2018-02-08 09:05:02 -06:00
deathride58
389e2ac804 Update remains.dm 2018-02-05 10:54:43 -05:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot
98d18ee7e3 [MIRROR] Removes tripai landmark (#5280) 
* Removes tripai landmark

* Update landmarks.dm
 2018-02-05 04:44:31 -06:00
CitadelStationBot
d4c270fe4a [MIRROR] [READY] Fixes de-initialization of cleanables-ash (#5295) 
* [READY] Fixes de-initialization of cleanables-ash

* Update morgue.dm

* Update morgue.dm
 2018-02-05 03:20:09 -06:00
CitadelStationBot
32fab09c69 [MIRROR] Remove revenantspawn landmark from code (#5271) 
* Remove revenantspawn landmark from code (#35238)

* Remove revenantspawn landmark from code
 2018-02-05 01:47:16 -06:00
CitadelStationBot
662f1904aa [MIRROR] Lavaland bomb runtime fix (#5246) 
* Lavaland bomb runtime fix

* Update cleanable.dm
 2018-02-05 00:56:37 -06:00
CitadelStationBot
17ccbb4a53 [MIRROR] Adds tiny shards (#5299) 
* Adds tiny shards (#35070)

* Adds tiny shards

* .

* .

* .

* .

* .

* .

* Adds tiny shards
 2018-02-05 00:53:52 -06:00
CitadelStationBot
de1d277b65 [MIRROR] Buffs Clogged Vents (#5301) 
* Buffs Clogged Vents (#34949)

* Buffs Clogged Vents

🆑 Iamgoofball
feature: Clogged Vents now has some teeth
/🆑

This was the only part of GoofEvents players liked

* Update effects_foam.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Buffs Clogged Vents
 2018-02-05 00:52:06 -06:00
CitadelStationBot
8fe05c8171 [MIRROR] Allows blobs to destroy decals (#5279) 
* Allows blobs to destroy decals

* Allows blobs to destroy decals
 2018-02-04 23:14:15 -06:00