CitadelStationBot
bbc28aa856
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #2049 )
2017-07-17 22:51:51 -07:00
LetterJay
8d31153fdc
Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223
...
[MIRROR] Organ Update [Cloning isn't broken edition]
2017-07-15 23:18:53 -05:00
ktccd
6d3123f63c
Readds borers ( #1999 )
...
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -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
CitadelStationBot
507f3d7761
The officer's sabre can be used to remove a lizard's tail.
2017-05-29 11:08:28 -05:00
LetterJay
750baf3dca
multi level
2017-05-29 02:15:26 -05:00
LetterJay
a29e0c45ae
BEACHBUMBS!
2017-05-28 21:54:10 -05:00
LetterJay
77b4be8b3f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528
2017-05-28 21:49:30 -05:00
CitadelStationBot
4576d03eb4
Fixes attaching heads without brainmobs ( #1273 )
2017-05-28 15:27:25 -07:00
CitadelStationBot
4191e1f7fd
Adds the Beach Bum Language
2017-05-24 05:54:42 -05:00
CitadelStationBot
2617011eb5
Having less legs won't slow you down if you're in zero gravity with a jetpack
2017-05-22 07:08:59 -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
LetterJay
485bca003f
Merge pull request #640 from Citadel-Station-13/upstream-merge-26527
...
[MIRROR] Zombie/limb refactors/fixes
2017-05-13 01:24:55 -04: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
CitadelStationBot
c7b78203a5
Fixes spelling error when implanting BITTEN organs ( #847 )
2017-05-08 16:48:44 -07:00
kevinz000
a87424e105
Merge pull request #735 from Citadel-Station-13/upstream-merge-26813
...
[MIRROR] Curator Update
2017-05-07 22:53:24 -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
6d2b02dabd
Allows Mediborg organ storage to hold inorganic bodyparts
2017-05-07 17:14:17 -05:00
CitadelStationBot
bbdcff81bb
Cultists of Nar-sie have their own language
2017-05-07 06:07:21 -05:00
kevinz000
32d81b8624
Merge pull request #736 from Citadel-Station-13/upstream-merge-26803
...
[MIRROR] Gives ears, eyes, and vocal cords plural gender
2017-05-06 21:24:15 -07: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
95495ffbcb
Makes dental implants move through dismemberment
2017-05-04 18:21:36 -05:00
CitadelStationBot
f5bc75c0bc
Moves tongues to mutanttongue var
2017-05-04 06:04:59 -05:00
