shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,095 Commits 5 Branches 0 Tags
dc86bf28e16faecb6e6d2e476b71464b23eb9c32
Commit Graph
76 Commits
Author SHA1 Message Date
LetterJay f668021230 commit 2017-06-19 17:33:40 -05:00
LetterJay 9332353714 update 2017-06-19 17:31:00 -05:00
LetterJay 866a569e41 dmi to png 2017-06-19 17:28:06 -05:00
LetterJay 12055144e4 fix it 2017-06-19 16:09:16 -05:00
CitadelStationBotandkevinz000 9301af36da Makes RCD ammo use consistent + small speed tweaks (#1646) 2017-06-17 13:14:59 -07:00
LetterJayandGitHub 923c5b9035 Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881 
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
 2017-06-08 03:35:23 -05:00
CitadelStationBotandkevinz000 bf4973e580 Refactor another spawn (#1394) 2017-06-04 09:04:32 -07:00
CitadelStationBotandkevinz000 79ff2672b4 [MIRROR] Clean snow, lavaland, and thunderdome (#1261) 
* Clean snow, lavaland, and thunderdome

* Delete mining.dm.rej
 2017-06-02 22:01:46 -07:00
LetterJayandGitHub fbbceadc6e Merge branch 'master' into AllMapChangesInOne 2017-05-30 23:08:32 -05:00
LetterJay 9b00499d24 It's been a long night 2017-05-30 22:41:22 -05:00
LetterJayandGitHub 1763c4b65d Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530 
[MIRROR] Area Refactor + Var-edit Cleanup
 2017-05-30 20:49:42 -05:00
CitadelStationBot 4f9c8a0869 Luxury Bluespace Shelter Capsules, Take 2. 2017-05-30 17:05:54 -05:00
CitadelStationBotandkevinz000 a1ebd8c791 Refactors how diagonal smoothing underlays work (#1187) 2017-05-27 13:40:09 -07:00
CitadelStationBotandkevinz000 e5f2a09622 Pixel projectile ricochets and reflections! (#1220) 2017-05-27 13:27:52 -07:00
CitadelStationBot b8b879af45 Gibtonite now uses defines 2017-05-23 15:29:11 -05:00
LetterJayandGitHub 3ca696ac82 Merge pull request #1117 from Citadel-Station-13/upstream-merge-27526 
[MIRROR] Chasms will glow dimly, like lava
 2017-05-23 05:14:30 -05:00
CitadelStationBot 6b4b6ee70d Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls 2017-05-22 22:21:20 -05:00
CitadelStationBot 60f1e4348a Chasms will glow dimly, like lava 2017-05-22 22:11:53 -05:00
CitadelStationBot efa9de6da9 Area Refactor + Var-edit Cleanup 2017-05-22 22:08:35 -05:00
LetterJay d1db0044d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344 2017-05-22 11:52:18 -05:00
CitadelStationBot 4e5617ad54 Megafauna and lavaland mobs will no longer spawn directly on top of the mining base 2017-05-21 22:28:10 -05:00
PoojawaandGitHub 45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot 36072177f9 [READY]Peacekeeper cyborg projectile dampening fields, attempt three 2017-05-18 16:36:50 -05:00
CitadelStationBotandPoojawa 946013ac22 Fixes rcds working on transit space (#981) 2017-05-18 11:54:10 -05:00
CitadelStationBotandPoojawa c61bb0476f [MIRROR] Cleans up some Initializes (#943) 
* Cleans up some Initializes

* Update farm_animals.dm

* Delete farm_animals.dm.rej

* Update farm_animals.dm
 2017-05-18 11:13:53 -05:00
CitadelStationBotandPoojawa a681b306a6 [MIRROR] Buffs plasma and nerfs snow (#924) 
* Buffs plasma and nerfs snow

* Update mineral.dm

* Delete mineral.dm.rej
 2017-05-18 11:13:28 -05:00
CitadelStationBotandPoojawa 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
LetterJayandGitHub 52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
CitadelStationBotandkevinz000 53dba37fca Fixes decals on shuttles (#855) 2017-05-08 16:44:59 -07:00
kevinz000andGitHub d9908a74a7 Merge pull request #748 from Citadel-Station-13/upstream-merge-26808 
[MIRROR] Adds aesthetic basalt floor tiles
 2017-05-07 06:24:50 -07:00
CitadelStationBot b5a14bb6ab New dirt sprites and jungle chasms 2017-05-04 18:38:58 -05:00
CitadelStationBot da781e0d76 Adds aesthetic basalt floor tiles 2017-05-04 06:12:26 -05:00
LetterJay 6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJayandGitHub fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
CitadelStationBot 036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
LetterJayandGitHub 06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
LetterJay 991fb8335c manual merge 2017-04-29 11:42:28 -05:00
CitadelStationBot 08a01aa11b Refactors roundstart checks slightly 2017-04-26 17:06:29 -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
CitadelStationBotandPoojawa 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
CitadelStationBotandTalkingCactus 64068fc614 Proximity sensing refactor (#425) 2017-04-16 18:15:29 -04:00
TalkingCactusandGitHub abd7f2b348 Cleans Up Rejected Mirror files (#414) 
* bang

* updates tgstation.dme

* fixes missing stylesheet entries

* updates the map

includes backup map file

* removes ten billion runtimes
 2017-04-15 17:55:53 -04:00
CitadelStationBotandTalkingCactus c38fa1eaa3 Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths (#410) 2017-04-15 15:01:54 -04:00
CitadelStationBotandTalkingCactus 09572935ca [MIRROR] Fixes plasmamen burning to death in cloning pods (#382) 
* Fixes plasmamen burning to death in cloning pods

* fix travis
 2017-04-15 14:36:59 -04:00
PoojawaandGitHub 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
PoojawaandGitHub 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
TalkingCactusandGitHub 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
LetterJay fee5a75274 double fuck 2017-03-24 02:15:02 -05:00