shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,474 Commits 5 Branches 0 Tags
bb4aecbd5f3d1f4af7f6d3ccca9add4111f41d8f
Commit Graph
229 Commits
Author SHA1 Message Date
Fermi bb4aecbd5f Progressional fixes 2019-05-20 07:44:39 +01:00
Fermi 4ef1355933 Made "heyo" a phase 2 2019-05-18 03:32:58 +01:00
Fermi 2f75f861ce Explode proc set up 2019-05-18 01:19:04 +01:00
Fermi cabf490134 Fixed compiling errors for Neko. 2019-05-17 16:57:42 +01:00
Fermi fa5531285a Push for Neko, probably doesn't compile atm. 2019-05-17 16:23:34 +01:00
Fermi 246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) 2019-05-16 00:58:30 +01:00
Fermi ec2f33ceb5 Added Hatmium and a few slight fixes. 2019-05-12 03:42:23 +01:00
Fermi f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
ThalpyandGitHub 926bd65392 Merge branch 'master' into FermiChem 2019-05-11 14:14:20 +01:00
Fermi 6a17d66323 Should be most compiling errors fixed outside of outdated merge problems 2019-05-11 14:04:43 +01:00
Fermi 6466ef562c 100 down, 66 to go. 2019-05-11 02:05:25 +01:00
Fermi 29d4a2fdde Finished MCchem, now to fix compling errors. 2019-05-11 00:14:04 +01:00
Fermi 7d567fee63 MC chem 5.5/6 2019-05-10 02:00:17 +01:00
Fermi 854c0097d4 MC 5/6th done, probably. 2019-05-08 23:13:51 +01:00
Fermi 1385e12fe3 MC 4/6th done 2019-05-07 23:38:50 +01:00
Fermi f31a46e029 Fixed a few things, 1/2 way through MC chem. 2019-05-05 20:32:07 +01:00
Fermi b71bc7d9dc Added happiness, psicodine, neurine and 2/6th of MC chem 2019-05-04 17:50:43 +01:00
Fermi bca578ab2c About 1/6th done of MC base code 2019-05-03 03:02:37 +01:00
Fermi e70eac8f53 Futher fixes and for some reason something broke arrrghhh. 2019-05-02 08:44:06 +01:00
Fermi 5ade1a27f0 Everything fixed. 
BE largement (probably) fully functional
PE I think has issues ripping clothes?
 2019-04-30 05:43:49 +01:00
Fermi 4bd2da202b Added OwO chem, 
Fixed asset growth
Added new sprites
 2019-04-30 01:02:01 +01:00
kevinz000andGitHub 63dd18c790 Merge pull request #8180 from Trilbyspaceclone/Weebo 
adds toy katana and lum eyes to load out - Requested by MrJWhite
 2019-04-02 05:35:31 -07:00
TrilbyspacecloneandGitHub 1dc121e407 Update autosurgeon.dm 2019-03-28 21:33:21 -04:00
Poojawa fbc2b15d21 Make sure the oxygen max doesn't do fucky things 2019-03-21 15:13:11 -05:00
Poojawa 0ffa3f6670 carbon Oxygen toxicity 2019-03-21 15:05:58 -05:00
Zargulandkevinz000 4574627250 Low plasma concentration does not damage anymore (#7977) 
* Update lungs.dm

* Update lungs.dm

* Update lungs.dm
 2019-02-08 02:11:02 -08:00
kiwedesparsandGitHub a876e985e7 adds bwoink and snap to vog 
this isn't needed
adds heyo to orgasm words too.

however, man once thought of something really stupid, and man's contributor didn't want to do it, so man made it happen
 2019-01-24 18:41:42 -08:00
deathride58 9f294f523e buffs and nerfs night vision trait 2018-11-30 20:36:27 -05:00
izzyinboxandkevinz000 172a46bcbe adds voice of god orgasm and dab commands (#7694) 2018-11-09 19:10:42 -08:00
Poojawa 99e57fb221 various citadel tweaks/fixes 
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
 2018-09-17 03:26:05 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000andGitHub 0bdf684933 Update augments_internal.dm 2018-08-24 23:28:06 -07:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -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
LetterJayandGitHub c1aab03bb5 Merge branch 'master' into upstream-merge-37530 2018-05-22 07:19:06 -05:00
Nichandletterjay 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
XDTMandletterjay ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
ArmhulenandCitadelStationBot 04057dc7d6 Plasmamen organs GET sprites! (#37595) 
* DONE

* initial

* Removes random slashes
 2018-05-02 21:21:11 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturskaandCitadelStationBot ec2de88a65 Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use 2018-04-29 17:32:12 -05:00
deathride58andGitHub 62d64a8647 Merge pull request #6509 from Citadel-Station-13/upstream-merge-37402 
[MIRROR] Fixes autosurgeon icon
 2018-04-27 09:32:05 +00:00
AnturKandCitadelStationBot e50b647ea4 Fixes autosurgeon icon (#37402) 
* Fixes autosurgeon icon

* Duh
 2018-04-24 16:03:33 -05:00
Poojawa 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Jordan BrownandCitadelStationBot edf4488c6b Merge pull request #37201 from kevinz000/patch-483 
Adds missing arguments to eye insert procs
 2018-04-15 22:25:14 -05:00
WinterousandCitadelStationBot 065522800a Forcing the human liver to actually do its job v2 (#37032) 
* Update liver.dm

* Update liver.dm

* Update liver.dm
 2018-04-11 09:33:49 -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
ShizCalevandCitadelStationBot 1c76539a5b Fixes mutant bodypart assignments 2018-03-31 06:15:24 -05:00
iksypandCitadelStationBot c0e45aa0a8 Night vision goggles no longer cancel out thermal eyes (#36609) 
cl
fix: night vision goggles no longer overwrite thermal eyes. nvg eyes no longer overwrite thermal goggles.
/cl

fixes #35921
 2018-03-28 12:16:38 -05:00