shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,207 Commits 5 Branches 0 Tags
924d8a676cbf6462332bbb6d8ae0aa257aeacb99
Commit Graph
71 Commits
Author SHA1 Message Date
GhomandGitHub fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi 
The Great Citadel De-Pissening of 2020
 2020-01-28 18:12:30 +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
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
CameronWoof 0c70fc9234 The Great Citadel De-Pissening of 2020 2020-01-02 21:24:03 -08:00
Ghommie 57cecd2499 work 2019-12-25 06:54:44 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie 19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +01: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
Ghommie dd101ef221 Part 2 2019-11-19 18:00:56 +01: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
Ghommie 592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Ghommie b818b1eedd Updating spraycans and crayons code. 2019-07-17 15:45:48 +02:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa 42db44b39e Alien Ruin fix, various cherrypicked upstream fixes 
Also adds new buildmode
 2018-09-13 22:55:11 -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
orangesandletterjay 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
Jordan Brownandletterjay 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
deathride58andkevinz000 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
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Tad HardestyandCitadelStationBot 09cf7216b2 Fix grammar in lightbulb shatter message (#37207) 2018-04-15 22:43:54 -05:00
Poojawaanddeathride58 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
CitadelStationBotandPoojawa 42fa773aaf [MIRROR] Fixes backup light rounding (#5759) 
* Fixes backup light rounding - #36060

* Fixes backup light rounding
 2018-03-02 18:42:19 -06:00
CitadelStationBotandPoojawa 3c7520f1f1 [MIRROR] Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff) (#5687) 
* Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff) (#35879)

* adds an above lighting layer, adds lighting overlays

* fixes wonkiness with broken and burned lights

* decreases overlay alpha a tad bit

* i gotta test this - removes new() override from mutable_appearance

* readds /mutable_appearance/New() for legacy behaviour

* Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff)
 2018-02-24 06:08:23 -06:00
deathride58andGitHub cc334136f4 Update lighting.dm 2018-02-21 13:08:05 -05:00
Jordan BrownandCitadelStationBot bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
Jordan BrownandCitadelStationBot f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
MMMiraclesandCitadelStationBot 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBotandPoojawa dc06d0373c [MIRROR] Fixes lightfixture placement issue (#5225) 
* Fixes lightfixture placement issue

* Fixes lightfixture placement issue
 2018-02-04 22:06:22 -06:00
deathride58andPoojawa 142e96a2dd [READY] Adds night shifts (#4281) 
* initial commit - adds night shifts

* fixes lighting not updating when nightshift is triggered and fixes compiling issues

* makes red alert override nightshift

* Update lighting.dm

* adds announcements for nightshift changes

* fixes nightshift flip-flopping during the night, adjusts night message a little, moves from minor_announce to priority_announce

* Update cit_nightshift.dm

* fixes compiling errors
 2018-02-04 21:28:41 -06:00
YPOQandCitadelStationBot 8c7645fd2b Fixes emergency lights having null brightness (#34796) 2018-01-24 06:13:06 -06:00
MrDoomBringerandCitadelStationBot 4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
deathride58andCitadelStationBot 9e6ce24a57 removes magic numbers from the set_light var in lights (#34714) 2018-01-21 21:13:57 -06:00
Jordan BrownandCitadelStationBot 805a07de7e Merge pull request #34679 from Xhuis/patch-3 
Fixes emergency lights literally never working
 2018-01-21 09:10:20 -06:00
deathride58 aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
Ashe HiggsandCitadelStationBot 2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
deathride58andGitHub 0c7bc2f3fe Merge pull request #4292 from Citadel-Station-13/upstream-merge-33376 
[MIRROR] Flickering no longer enables emergency lights
 2017-12-10 03:07:54 +00:00
Jordan BrownandCitadelStationBot 2029473a48 Merge pull request #33397 from Xhuis/em_light_fix 
Fixes emergency lights having infinite power, and replaces their magic number with a define
 2017-12-09 15:53:49 -06:00
Jordan BrownandCitadelStationBot 7b9bcb37aa Merge pull request #33376 from Xhuis/patch-3 
Flickering no longer enables emergency lights
 2017-12-09 15:53:20 -06:00
orangesandCitadelStationBot dc2d191eba Merge pull request #33332 from AnturK/lightfix 
Fixes light breaking
 2017-12-06 16:20:31 -06:00
deathride58andGitHub 84fe88153e merges #4208 2017-12-04 16:17:43 -05:00
deathride58andGitHub 4d29723302 Update lighting.dm 2017-12-03 18:25:54 -05:00
Ashe HiggsandCitadelStationBot 5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06: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
KorPhaeronandCitadelStationBot 6ea3f1293c You can smash the bulbs in floodlights (#31690) 
* You can smash the bulbs in floodlights

* Floodlight breaking but properly
 2017-10-15 12:55:31 -05:00
Jordan BrownandCitadelStationBot 572f3b8905 Merge pull request #31585 from ShizCalev/empty-light-editor-fix 
Fixes empty light fixtures showing as working lights in DM
 2017-10-12 15:27:37 -05:00
LeoandCitadelStationBot ed3a031543 Merge pull request #31497 from AnturK/cyberboss-pls 
Fixes some tempremoves
 2017-10-10 07:10:35 -05:00