LetterJay
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
LetterJay
be70bbbd5c
Merge pull request #1597 from Citadel-Station-13/GulimonsRus
...
Adds guilmon as a race (via Muffin)
2017-06-14 11:47:09 -05:00
LetterJay
67770a25be
final commit(?)
2017-06-14 09:54:14 -05:00
LetterJay
28d726d1af
Still need to fix the head.
2017-06-14 04:54:28 -05:00
LetterJay
276bb8b786
Merge pull request #1483 from Citadel-Station-13/upstream-merge-28185
...
[MIRROR] Fixes ghosts not returning an initialize hint
2017-06-12 12:44:10 -05:00
CitadelStationBot
ea05bdbc26
Makes arrivals shuttle slightly more juicy
2017-06-11 17:28:44 -05:00
CitadelStationBot
180f0e82c8
Fixes ghosts not returning an initialize hint
2017-06-08 09:45:52 -05:00
CitadelStationBot
c5143880d2
Fixes logged out spawning new_players
2017-06-06 13:28:23 -05:00
CitadelStationBot
e8663bee81
Refactors the latejoin list
2017-06-04 15:08:35 -05:00
CitadelStationBot
1937fc5294
Fixes delayed login message
2017-05-26 23:53:21 -05:00
CitadelStationBot
6617f68604
[MIRROR] Harvesters are more fun to play ( #894 )
...
* Harvesters are more fun to play
* resolve .rej
2017-05-18 07:12:29 -05:00
CitadelStationBot
4f971be3a9
[MIRROR] Golems do not have underclothing ( #784 )
...
* Golems do not have underclothing
* Resolves .rej
* Update golems.dm
* Update golems.dm
2017-05-18 03:53:14 -05:00
CitadelStationBot
257cf986c5
Repaths C4 ( #808 )
...
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
LetterJay
1948b007d1
fix roundstart/rej cleanup
2017-05-17 05:08:51 -05:00
LetterJay
bdbedd33f4
Merge branch 'master' into upstream-merge-26776
2017-05-17 05:14:18 -04:00
LetterJay
f978e3d56e
rej cleanup
2017-05-17 03:50:34 -05:00
LetterJay
46f5c4bb1b
commit
2017-05-16 23:35:54 -05:00
LetterJay
3d0a1b2573
commit
2017-05-14 00:05:53 -05:00
LetterJay
a9e0b28872
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26908
2017-05-14 00:04:52 -05:00
CitadelStationBot
afdf829abc
[MIRROR] Visible ghosts emit light ( #877 )
...
* Visible ghosts emit light
* Update ghost.dm
* Delete ghost.dm.rej
2017-05-10 16:16:23 -07:00
CitadelStationBot
c782e15d64
[MIRROR] Fix server hop ( #740 )
...
* Fix server hop
* Delete new_player.dm.rej
2017-05-08 16:47:21 -07:00
LetterJay
2efe90055f
Revert "[MIRROR] Fixes say verbs not working"
2017-05-07 19:41:33 -04:00
CitadelStationBot
877acc972a
Fixes dead mobs being initialized twice
2017-05-05 18:12:07 -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
f7d45f3010
Fixes say verbs not working
2017-05-04 18:41:04 -05:00
LetterJay
4ecbec1406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720
2017-05-02 11:36:27 -05:00
LetterJay
fd6df15f93
Merge branch 'master' into upstream-merge-26131
2017-05-02 09:19:49 -05:00
LetterJay
4a6ffec412
rej cleanup
2017-05-02 04:56:46 -05:00
LetterJay
2d9a497f31
Merge pull request #609 from Citadel-Station-13/upstream-merge-26625
...
[MIRROR] Server hop can now be used in lobby
2017-05-01 07:39:35 -05:00
CitadelStationBot
7a4f1496e9
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
2017-05-01 07:24:45 -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
CitadelStationBot
a0c1f979dc
Fixes templates/ruins not updating area list
2017-04-27 17:02:33 -05:00
CitadelStationBot
82ecda1353
Server hop can now be used in lobby
2017-04-27 16:40:53 -05:00
CitadelStationBot
08a01aa11b
Refactors roundstart checks slightly
2017-04-26 17:06:29 -05:00
CitadelStationBot
cea81a3357
Initialize Refactor
2017-04-26 16:03:17 -05:00
CitadelStationBot
c5eeb2de67
Revert "Ghosts call Moved() after Move() ( #26183 )" ( #510 )
2017-04-26 10:11:47 -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
de1d8188ae
removes rej files
2017-04-24 21:34:58 -05:00
CitadelStationBot
ffc35f33ba
Ghosts no longer drift in space
2017-04-24 17:53:49 -05:00
CitadelStationBot
1a93abc66e
Conveyor movement refactor/fix
2017-04-21 17:28:09 -05:00
Squi-RL
fc1fd4b72b
Acorn hologram & bug fix for eevee tails ( #471 )
...
* Edited Eevee wag code
fixes the issue where the tail tip color disappears while wagging
* Adds an acorn hologram
as the title says, adds an acorn hologram... it's animated too!
* Adds code to support the Acorn
allows an AI to select "acorn" from the unique hologram catagory
2017-04-20 22:05:17 -05:00
LetterJay
de2d0985c4
Merge pull request #440 from Citadel-Station-13/upstream-merge-26134
...
[MIRROR] Refactors dbcon into a subsystem
2017-04-19 20:46:02 -05:00
Poojawa
ce577dc22c
Citadel sprite file cleanups ( #429 )
...
* Special folder cleanup
moved mam_body_markings and mam_taur to regular mob list for easier
locating. moved tail.dmi and wing.dmi to special
* oh
* this too.
* ports #423
alphabetatizes sprites because it was messy
* tweak special folder name to be clearer
* Travis appeasement
2017-04-18 23:05:17 -05:00
CitadelStationBot
278cbbaf35
Refactors dbcon into a subsystem
2017-04-17 09:46:09 -05:00
CitadelStationBot
4025a985d4
Ghosts call Moved() after Move() ( #398 )
2017-04-15 14:44:44 -04: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
Squi-RL
cdc32c98fa
Eevee/Eeveetaur additions! ( #359 )
...
* Adds eevee ears and tail
* Adds eevee neck fur sprite
* Adds an eevee taur sprite
* adds the code for Eevee and it's taur body
allows players to choose said things
2017-04-12 23:38:35 -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
Poojawa
7ad5e22830
Wew lad ( #305 )
...
* 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
* based cyberboss.
* you'd think github would suck less.
* vendors
* tweaks and specialty vendors.
* map things
* go away shitty omega
* qdeletion spam supress, maps.txt tweaks
* shuttle lights
2017-03-22 02:55:33 -05:00
