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
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
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -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
LetterJay
c93c5bf50f
Merge pull request #655 from Citadel-Station-13/upstream-merge-26693
...
[MIRROR] Prevents GODMODE mobs from dying to organ removal
2017-05-01 08:00:07 -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
06bfa8770e
Merge branch 'master' into upstream-merge-26129
2017-04-29 11:45:37 -05:00
CitadelStationBot
daeba2eec7
Zombie/limb refactors/fixes
2017-04-28 21:05:06 -05:00
CitadelStationBot
402c451cc3
Adds organ storage containers
2017-04-28 20:56:26 -05:00
LetterJay
a39b40d879
Merge pull request #578 from Citadel-Station-13/upstream-merge-25981
...
[MIRROR] Initialize Refactor
2017-04-28 09:29:00 -05:00
LetterJay
085b421348
rej fixes
2017-04-28 09:03:56 -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
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
CitadelStationBot
cea81a3357
Initialize Refactor
2017-04-26 16:03:17 -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
CitadelStationBot
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
LetterJay
f70e00d8cd
Merge pull request #531 from Citadel-Station-13/upstream-merge-26441
...
[MIRROR] Plasmamen tongues, plasmaman lung sprites
2017-04-25 22:00:26 -05:00
LetterJay
6b303ccecc
/tg/ has tongues in their own file, maybe we should too?
2017-04-25 21:52:13 -05:00
LetterJay
87611ef7c1
Merge pull request #564 from Citadel-Station-13/upstream-merge-26584
...
[MIRROR] Fixes monkey transformation instantly killing a person
2017-04-25 20:36:02 -05:00
CitadelStationBot
607ab2b784
Fixes monkey transformation instantly killing a person
2017-04-25 15:45:27 -05:00
CitadelStationBot
d931e5801c
A bunch of Initialize()s now have return values
2017-04-25 03:51:57 -05:00
CitadelStationBot
de50b582ae
Braining/debraining fixes
2017-04-23 14:48:31 -05:00
CitadelStationBot
19f06b5114
Fixes armlasers breaking on retract ( #498 )
2017-04-20 22:03:30 -05:00
CitadelStationBot
aa95a64a92
Fixes flashlight eyes
2017-04-19 04:34:58 -05:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
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
TalkingCactus
c997ebcabd
Removes Lag (tm) ( #313 )
...
* sensible fixes
* this too
* some more
* fixes chair icons
reverted to state before tg pull
* fixes telecomms icons
revert to state before tg pull
* fixes research icons
reverted to before tg pull
* de-whitewashed the stools
* fixed missing broadcaster sprites
* always load from the savefile
helps custom servers who don't want to fuck with the config, this will
never not be wanted with the system we have
* stop it, ghosts
* fixes limb augmentation
https://github.com/tgstation/tgstation/pull/25446
* removes lag
* re-adds sounds
* exception
* makes travis happy
2017-03-26 09:39:29 -04:00
