shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,856 Commits 5 Branches 0 Tags
b2e176346c33afbefeb744b4e88198d1ea9fe3aa
Commit Graph

71 Commits

Author SHA1 Message Date
CitadelStationBot
d2e771c9f3 Adds cybernetic organs (#2135) 2017-07-26 00:04:59 -07:00
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBot
3ee26917bd Organ Update [Cloning isn't broken edition] 2017-07-14 09:00:36 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
a1ff07ed1f [MIRROR] Organs for catgirls (#1457) 
* Organs for catgirls

* Delete tgstation.dme.rej

* Update tgstation.dme
 2017-07-05 09:12:59 -05:00
LetterJay
735b25c6e3 Merge branch 'master' into upstream-merge-28916 2017-06-30 10:36:11 -05:00
LetterJay
0390dce2e6 Update heart.dm 2017-06-30 10:35:24 -05:00
CitadelStationBot
c4e8b87f44 Heartbeat fix 2017-06-30 09:18:18 -05:00
CitadelStationBot
98ff55f786 Adds heartbeats 2017-06-28 14:01:39 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot
9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
CitadelStationBot
ca6b27a482 Fixes high luminosity eyes (#1603) 2017-06-14 19:53:36 -07:00
LetterJay
226345d82a upstream-merge-28109 
upstream-merge-28352
 2017-06-13 01:10:21 -05:00
CitadelStationBot
e59e7f8d06 Fixes bsa not showing up (#1396) 2017-06-04 09:03:30 -07:00
LetterJay
750baf3dca multi level 2017-05-29 02:15:26 -05:00
LetterJay
a29e0c45ae BEACHBUMBS! 2017-05-28 21:54:10 -05:00
CitadelStationBot
4191e1f7fd Adds the Beach Bum Language 2017-05-24 05:54:42 -05:00
CitadelStationBot
1da5a27b98 Adjusts ear/eye protection based on missing organs (#999) 2017-05-18 12:07:33 -05:00
CitadelStationBot
c6a671a11b [MIRROR] Devil refactor+small revamp (#887) 
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
 2017-05-18 09:06:01 -05:00
CitadelStationBot
ad65636014 [MIRROR] Fixes saying nothing when you have no language (#861) 
* Fixes saying nothing when you have no language

* fix .rej

* Update say.dm
 2017-05-18 06:12:39 -05:00
LetterJay
00b14017c0 ook ook language 2017-05-17 10:15:30 -05:00
LetterJay
5da8c5d520 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26952 2017-05-17 10:12:36 -05:00
LetterJay
5b1fc3194d Merge pull request #810 from Citadel-Station-13/upstream-merge-26991 
[MIRROR] Follow links on adamantine vocal cords now work
 2017-05-17 11:05:10 -04:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
ff21afdcbd Merge pull request #744 from Citadel-Station-13/upstream-merge-26828 
[MIRROR] Moves tongues to `mutanttongue` var
 2017-05-17 04:50:52 -04:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay
fe62f7b737 Merge pull request #734 from Citadel-Station-13/upstream-merge-26780 
[MIRROR] Draconic language, for lizards
 2017-05-17 04:49:13 -04:00
LetterJay
e03b4b7905 ooga booga lizard 2017-05-16 23:46:37 -05:00
LetterJay
7b41f8cd55 merge 2017-05-16 16:22:57 -05:00
LetterJay
2d7c5cdbd7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26991 2017-05-16 16:22:12 -05:00
CitadelStationBot
c5ed5b84e3 Zombies can see in the dark 2017-05-12 15:57:11 -05:00
CitadelStationBot
faf8829d30 [MIRROR] Adamantine golem leadership (#785) 
* Adamantine golem leadership

* Update stylesheet.dm

* Delete golems.dm.rej

* Delete stylesheet.dm.rej

* Update golems.dm

* fuck line endings
 2017-05-08 22:16:09 -07:00
kevinz000
2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
CitadelStationBot
bbdcff81bb Cultists of Nar-sie have their own language 2017-05-07 06:07:21 -05:00
CitadelStationBot
e0b2a0f1eb Follow links on adamantine vocal cords now work 2017-05-06 15:12:29 -05:00
CitadelStationBot
56d5e12263 Moves languages to a holder datum, gives mind its own language holder 2017-05-05 08:13:04 -05:00
CitadelStationBot
f5bc75c0bc Moves tongues to mutanttongue var 2017-05-04 06:04:59 -05:00
CitadelStationBot
b7d451cbe9 Gives ears, eyes, and vocal cords plural gender 2017-05-03 22:22:19 -05:00
CitadelStationBot
33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
CitadelStationBot
a87a75d059 Draconic language, for lizards 2017-05-03 22:22:07 -05:00
LetterJay
4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
LetterJay
03bae077e9 Merge pull request #666 from Citadel-Station-13/upstream-merge-26706 
[MIRROR] Removes Rest from Voice of God
 2017-05-01 08:03:50 -05:00
CitadelStationBot
2338f75116 Removes Rest from Voice of God 2017-04-30 11:23:24 -05:00
CitadelStationBot
c0e0e6c538 Prevents GODMODE mobs from dying to organ removal 2017-04-29 16:55:58 -05:00
LetterJay
0331578b08 fix for ear runtime 2017-04-28 08:14:01 -05:00
CitadelStationBot
bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00
CitadelStationBot
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