shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,212 Commits 5 Branches 0 Tags
438daa7acffbb34bc26db4485a8d2c81efcb31ce
Commit Graph

283 Commits

Author SHA1 Message Date
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Jordan Brown
888b04427c Merge pull request #38683 from AnturK/anomalyfix 
Fixes anomaly area selection.
 2018-06-25 09:18:40 -05:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
Tad Hardesty
221e539eb8 Fix item fortification scrolls stacking (#38551) 2018-06-18 09:36:27 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -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
CitadelStationBot
1ce820d2ed [MIRROR] Adds action features to the metastation beerkeg-nukes (#6925) 
* Adds action features to the metastation beerkeg-nukes (#38084)

* Hottomonkulu Pyynö mos kyren hepität. Nerse marentaat aluturnate.

* Masennoo sum keuron väkeltäät vassem Pyynö er borsalitaat Urmas.

* Tarnatat kuulor ustanitat vernes heuremasso seurutik Pyynör kanervo mahkatosimos. Atti ivakhan nutiv.

* Surmustulet nasnas kyhille nes viuhuntut sepelitör arnisansatin.

* Adds action features to the metastation beerkeg-nukes

* Test 1

* Test 2

* Test 3
 2018-05-27 19:32:09 -07:00
LetterJay
7caef42502 Merge pull request #6899 from Citadel-Station-13/upstream-merge-37993 
[MIRROR] Adds two saferChems for vent clogs.
 2018-05-26 18:38:19 -05:00
Jordan Brown
7fe11dc952 Merge pull request #37993 from DaxDupont/more-juice 
Adds two saferChems for vent clogs.
 2018-05-25 10:54:20 -05:00
vuonojenmustaturska
1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017) 
* henk

* iseffect
 2018-05-25 07:38:01 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJay
6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 
[MIRROR] Uppercases slot defines.
 2018-05-21 11:23:02 -05:00
81Denton
1c51f32b31 Remove skewium from saferChems (#37925) 2018-05-21 03:57:05 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
deathride58
146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 
[MIRROR] [s] Hallucinations 4.0
 2018-05-17 18:12:57 +00:00
ShizCalev
394fbf09e3 Fixes vent_clog bad chem id runtime (#37887) 
* Fixes vent_clog bad chem id runtime

* sodiumchloride
 2018-05-17 10:56:35 -05:00
XDTM
ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
vuonojenmustaturska
0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
Jordan Brown
dc9ce0cc6f Merge pull request #37590 from 81Denton/cargo-categories 
Reorganizes cargo's big "miscellaneous supplies" category
 2018-05-01 15:37:54 -05:00
Jordan Brown
8f1bb462ad Merge pull request #37554 from DaxDupont/vents 
Adds some more reagents to clogged vents
 2018-04-30 12:46:58 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Dax Dupont
df3c160d0c Makes clogged vents scale, and way less powerful. (#37385) 
* Makes clogged vents scale, and way less powerful.

* tweaked numbers
 2018-04-27 13:05:36 -05:00
KorPhaeron
ec080ab80b Paperwork Error Event (#37443) 
* Paperwork Error Event

* Condense the proc

* Properly calls set_overflow_role
 2018-04-27 00:58:24 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
kachnov
03c9996bc4 Fixes Kudzu growing in space (#36701) 
* initial commit

* adds a macro

* a small change

* Update spacevine.dm
 2018-04-19 03:13:47 -05:00
Jordan Brown
f52f0f9f33 Reduces aurora caelus weight to that of meteors 2018-04-13 09:02:28 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
deathride58
ed2de4a61e Merge pull request #6115 from Poojawa/metabreaking 
Metabreaks event reports
 2018-04-08 04:17:35 +00: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
Jordan Brown
c47a034069 Merge pull request #36834 from KorPhaeron/darkness2 
Removes advanced darkness
 2018-04-01 00:08:53 -05:00
Poojawa
50d9ff9295 ups the prob of anomaly reports, add dust 2018-03-29 15:26:53 -05:00
Poojawa
f25757e011 There is absolutely no way I'm modularizing this 2018-03-26 04:08:18 -05:00
oranges
9ea4bd45c2 Merge pull request #36432 from ShizCalev/braindamageeventruntime 
Fixes brain damage json runtime
 2018-03-17 07:54:04 -05:00
CitadelStationBot
31ffc89cbc [MIRROR] Adds the Aurora Caelus event, the deep-space equivalent of the northern lights. (#5920) 
* Adds the Aurora Caelus event, the deep-space equivalent of the northern lights. (#35987)

* Aurora caelus

* I saw that!

* fix?

* Weight increase for testmerge

* Update aurora_caelus.dm

* Adds the Aurora Caelus event, the deep-space equivalent of the northern lights.
 2018-03-12 13:13:00 -05:00
CitadelStationBot
2aa4fef8e1 [MIRROR] Tidy Processor Overload event code (#5876) 
* Tidy Processor Overload event code (#36277)

* Tidy Processor Overload event code
 2018-03-10 07:17:25 -06:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -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
Tad Hardesty
6402912a32 Allow configuring ruin/empty space level count - #36191 
Allows map configs to set how many ruin levels (def. 7) and how many empty levels (def. 1) that will be created. Most useful for landlocked stations, event/one-off stations with unusual composition, or testing situations such as RuntimeStation.
 2018-03-07 01:48:13 -06:00
Poojawa
86b11050b6 Citadel's folder's end (#5828) 
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
 2018-03-06 17:40:48 -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
CitadelStationBot
6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710) 
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
 2018-03-05 12:34:01 -06:00
CitadelStationBot
4fed776e7e [MIRROR] Heart Attack Event Actually Works Now (#5717) 
* Merge pull request #35928 from Robustin/brokenhearts

Heart Attack Event Actually Works Now

* Heart Attack Event Actually Works Now
 2018-02-27 05:04:12 -06:00
EtheoBoxxman
043457c9f3 Blob update (#5624) 
Ups the min players from 20 to 40 for a blob event to happen.
 2018-02-23 19:19:39 -06:00
deathride58
21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733 
[MIRROR] [s] Cameranet fixes
 2018-02-23 13:21:23 +00:00
81Denton
cfd768e09f Changes event earliest_start to use time helpers (#35841) 
* uses time helpers, tweaks santa/shuttle loan times

* hourS
 2018-02-21 11:38:26 -06:00