shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,029 Commits 5 Branches 0 Tags
d05624dbecb94be7b2b198e82aa5f04bc65da97e
Commit Graph
75 Commits
Author SHA1 Message Date
Seris02andGitHub 0e13afc10f yeet 2020-02-04 13:25:14 +08:00
Seris02 4c2e702d7a yee 2020-02-02 13:18:26 +08:00
Ghommie 542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Seris02andGitHub cebf2d2de2 does putnam's suggestion 
I edited this on a web browser so if it breaks blame putnam
 2019-12-02 00:30:20 +08:00
Seris02 136698ce7d Merge branch 'sleepingcarphallucination' of https://github.com/Seris02/Citadel-Station-13 into sleepingcarphallucination 2019-11-30 10:26:21 +08:00
Seris02 9788586bb2 fixes some things :hjonk: 2019-11-30 10:23:22 +08:00
Seris02GitHubGhom
 		84c2b7cef6 Update code/modules/flufftext/Hallucination.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-30 10:02:23 +08:00
Seris02 a4fb86df48 forgot to add it to the list of hallucinations you can have 2019-11-30 01:00:23 +08:00
Seris02 1e8227346c adds sleeping carp wrist wrench/violent grab hallucination 2019-11-30 00:50:27 +08:00
Ghommie 6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
kevinz000andGitHub b670c94ca4 Merge pull request #9790 from PersianXerxes/lowerMeteorWarnings 
Reducing meteor warning time
 2019-11-14 16:24:10 -07:00
Persi b8137cde65 Reducing meteor warning time 2019-11-12 06:02:24 -05:00
Ghommie 09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000andGitHub 07447917de Merge pull request #9744 from Seris02/meteorhallucinations 
makes meteor hallucinations have an ETA now
 2019-11-10 11:44:41 -07:00
Seris02 a5a483fb8a makes meteor hallucinations have an ETA now 2019-11-08 19:55:27 +08:00
Ghommie dcc81d92b5 Fixing a few throw_at calls and modular computer processors Init. 2019-11-04 00:12:41 +01:00
kevinz000andGitHub 6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements 
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
 2019-10-29 21:42:32 -07:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
deathride58 68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
kevinz000andGitHub b0a6624d73 Update Hallucination.dm 2019-10-04 22:12:35 -07:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Bear c6ce774327 what a gas 2018-11-01 22:35:18 -04:00
Poojawa cb342866d6 a few last minute changes from TG 
also changes His Grace from 25 to 10 requirments
 2018-09-18 23:12:29 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000 b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
XDTMandletterjay ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
kevinz000andCitadelStationBot 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
CitadelStationBotandPoojawa 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
Ashe HiggsandCitadelStationBot 0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
ShizCalevandCitadelStationBot 833a700cbb Fixes invalid throwat args (#35565) 2018-02-13 07:14:47 -06:00
Jordan BrownandCitadelStationBot fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
81DentonandCitadelStationBot 547a80eb22 [Ready] Rebalances Chameleon Kits for lowpop (#34972) 
* 🆑 Denton, Anonmare, kevinz000
tweak: Removed the player minimum on syndicate chameleon kits.
rscdel: To compensate, regular chameleon kits no longer contain noslip shoes.
tweak: Reduced the chameleon kit price to 2 TC (same total price for kit+noslips).
/🆑

Chameleon kits were given a minimum player limit due to the noslips that come with them.
This PR removes the player limit as well as the noslips, but lowers the TC cost by 2.

That way, lowpop tators can have disguises while highpop has the same total price for the old chameleon+noslips combo.

* Created a shoes/chameleon/noslip subtype and moved the NOSLIP_1 flag to it. Made sure that all other regular noslips refer to the new subtype.
 2018-01-27 23:21:06 -06:00
Jordan BrownandCitadelStationBot 05d87d54a3 Merge pull request #34438 from XDTM/EqualHallucinations 
Mass hallucinations now gives the same hallucination to everyone
 2018-01-18 16:52:03 -06:00
ShizCalevandCitadelStationBot 80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
deathride58 5dc3f29ad4 modules - E to L 2018-01-04 00:53:38 -05:00
RobustinandCitadelStationBot 4a93756e6b Hallucinations no longer show open doors "bolting" (#33859) 
* No more "bolting" open doors

* Update Hallucination.dm

* Update Hallucination.dm
 2017-12-27 08:26:16 -06:00
XDTMandCitadelStationBot 962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
XDTMandCitadelStationBot 988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
JordieandCitadelStationBot 4053499c83 A few investigate_log and message_admin fixes 2017-11-24 22:42:01 -06:00
ShizCalevandCitadelStationBot 2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
vuonojenmustaturskaandCitadelStationBot 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
orangesandCitadelStationBot d56e7c8c56 Merge pull request #32266 from AnturK/halalert 
Fixes hallucination alerts not clearing up properly.
 2017-11-01 21:37:57 -05:00
CitadelStationBotandPoojawa 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
kevinz000andCitadelStationBot ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
CitadelStationBotandPoojawa e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00