shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,732 Commits 5 Branches 0 Tags
52003b20f4484290dc46366ea1c73a6ea48d19df
Commit Graph
156 Commits
Author SHA1 Message Date
XDTMandCitadelStationBot 6e24ca43be Fixes Start() of symptoms still working when neutered 2017-10-08 19:10:43 -05:00
LetterJayandGitHub e9f481e4e4 Merge pull request #3215 from Citadel-Station-13/upstream-merge-31392 
[MIRROR] Fix: Prevents PANDEMIC Neutering Lockout
 2017-10-08 16:19:33 -04:00
LetterJayandGitHub a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386 
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
 2017-10-08 16:18:18 -04:00
CitadelStationBotandkevinz000 d1dcfb63f8 [MIRROR] Miscellaneous virus fixes (#3216) 
* Miscellaneous virus fixes (#31391)

* Probably fixes neutering bugs

* Proper targeting for healing

* Fixes itching affecting roboparts

* Miscellaneous virus fixes
 2017-10-07 23:04:26 -07:00
LetterJayandGitHub 12506ade24 Update cough.dm 2017-10-07 22:48:23 -05:00
RobustinandCitadelStationBot 98a34c2211 Virus Neuter Fix (#31392) 2017-10-07 18:01:57 -05:00
Jordan BrownandCitadelStationBot 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJayandGitHub ea493d3f3d Merge pull request #3063 from Citadel-Station-13/upstream-merge-31175 
[MIRROR] Fixes viruses not calling Start on their symptoms when spreading
 2017-10-01 23:39:41 -04:00
LetterJayandGitHub 1ecebee19d Merge pull request #3057 from Citadel-Station-13/upstream-merge-31171 
[MIRROR] Lastest
 2017-10-01 16:55:54 -04:00
XDTMandCitadelStationBot d274843958 Fixes viruses not calling Start on their symptoms when spreading 2017-10-01 15:22:19 -05:00
kevinz000andCitadelStationBot d76eb00634 Update viral.dm 2017-10-01 13:11:05 -05:00
LetterJayandGitHub cae6983aea Update wizarditis.dm 2017-09-30 14:25:05 -05:00
vuonojenmustaturskaandCitadelStationBot 98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
LetterJayandGitHub 54bd982d6b Merge pull request #2787 from Citadel-Station-13/upstream-merge-30681 
[MIRROR] Prevents the creation of Shadowzombiechangelings
 2017-09-22 08:43:37 -04:00
orangesandCitadelStationBot 41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
LetterJayandGitHub b996145a84 Update dna_spread.dm 2017-09-19 11:19:36 -05:00
KorPhaeronandCitadelStationBot d104c1d76c Prevents the creation of Shadowzombiechangelings 2017-09-15 03:08:07 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
kevinz000 5f5065eb46 kek 2017-08-29 09:59:57 -07:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000andGitHub 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000andGitHub 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJayandGitHub a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot 5eea016593 You can now click on symptoms in the Pandemic to see their description and stats 2017-08-19 18:52:55 -05:00
CitadelStationBot c17ca3001f Diseases will properly make new symptoms instead of sharing the same for everyone 2017-08-19 18:41:34 -05:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
LetterJayandGitHub 69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
CitadelStationBotandPoojawa 8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162) 
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
 2017-08-02 04:56:44 -05:00
kevinz000andGitHub bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
LetterJayandGitHub 35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBot 79e6963aca Hallucinations 3.0 2017-07-30 19:58:28 -05:00
CitadelStationBot 5da5e58ee5 Fixes a lot of eye damage procs 2017-07-30 08:16:38 -05:00
CitadelStationBotandkevinz000 53dc265b94 Fixes virology timing in a better way (#2124) 2017-07-27 05:30:43 -07:00
CitadelStationBotandkevinz000 7ce6be92a0 Virology fixes (#2097) 2017-07-24 04:08:07 -07:00
LetterJayandGitHub 92e967d904 Update vomit.dm 2017-07-19 05:15:51 -05:00
LetterJayandGitHub a11a7f770d Update vision.dm 2017-07-19 05:15:34 -05:00
LetterJayandGitHub ad2efb18be Update sensory.dm 2017-07-19 05:14:41 -05:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
kevinz000andGitHub 44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBotandkevinz000 f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot 194a6b7aa9 [Seriously, it's ready]Virology Rework: The Thresholdening 2017-07-13 17:46:25 -05:00
CitadelStationBotandkevinz000 ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot 9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
CitadelStationBot d859e3a637 Diseases can now only spread to mobs with an atmos line of sight 2017-06-08 17:18:06 -05:00
CitadelStationBot 29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -05:00
CitadelStationBot a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBotandPoojawa 84321916a5 Refactors ears into organs (#513) 
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
 2017-04-26 09:52:35 -05:00
PoojawaandGitHub 7e9b96a00f April sync (#360) 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
 2017-04-13 23:37:00 -05:00
PoojawaandGitHub f67e9f6d87 Bleeding edgy refresh (#303) 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
 2017-03-21 11:44:10 -05:00