shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
483 Commits 5 Branches 0 Tags
5688b6b3066bce9ef22ab125a95717491cdece36
Commit Graph
483 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000andGitHub 5688b6b306 Update chameleon.dm 2017-03-26 03:41:21 -07:00
kevinz000andGitHub 2a8fcb3929 Update chameleon.dm 2017-03-26 01:31:57 -07:00
kevinz000andGitHub 22cc36345f Update chameleon.dm 2017-03-26 01:30:32 -07:00
PoojawaandGitHub a8d181c00c Update admin_verbs.dm (#314) 
Enables moderator staff to issue controller restarts
 2017-03-25 14:52:44 -05:00
LetterJayandGitHub 4e134c6785 Merge pull request #310 from Citadel-Station-13/bleeding-edgy 
Bleeding edgy
 2017-03-24 03:52:45 -04:00
LetterJayandGitHub 691b20e333 Merge pull request #312 from LetterJay/bleeding-edgy 
double fuck
 2017-03-24 03:23:09 -04:00
LetterJay fee5a75274 double fuck 2017-03-24 02:15:02 -05:00
LetterJayandGitHub a22a2c06bb Merge pull request #311 from LetterJay/bleeding-edgy 
fuck
 2017-03-24 03:09:35 -04:00
LetterJay e07580413f fuck 2017-03-24 02:08:02 -05:00
LetterJayandGitHub f6838bc605 Merge pull request #309 from LetterJay/bleeding-edgy 
updates maploader, fixes a few things
 2017-03-24 02:53:14 -04:00
LetterJay 1d518bb4dd updates maploader, fixes a few things 2017-03-24 01:39:11 -05:00
LetterJayandGitHub 41808ea6ae Merge pull request #308 from TalkingCactus/bleeding-edgy 
local man fucks up a PR twice
 2017-03-24 00:58:59 -04:00
TalkingCactus 091e622da7 that's it, we're done. go home everyone 2017-03-24 00:32:44 -04:00
PoojawaandGitHub 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
TalkingCactusandPoojawa fcc5e0e2f5 fixes preview icon runtimes+ (#304) 2017-03-21 21:22:47 -05:00
PoojawaandGitHub f67e9f6d87 Bleeding edgy refresh (#303) 
* 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
 2017-03-21 11:44:10 -05:00
Squi-RLandPoojawa 099a6c8764 Ash drake plushie! (#300) 
* Update toys.dm

Adds a cute little Ash drake plushie at the bottom

* Add files via upload

* Adds in hand icons for the ash drake plushie

* removed the commented out lines from the plush drake code
 2017-03-21 05:47:47 -05:00
LetterJayandGitHub 18ec8db19c Merge pull request #299 from Leon-Leonardo/citadel.1.2.1 
citadel.1.2.1
 2017-03-19 23:52:44 -04:00
Leon-Leonardo e79f328158 delete old maps 2017-03-19 23:11:50 -04:00
TaxMasterandTalkingCactus b617e06a30 A small fix (#279) 
* Adds In Deep from RA2 into the roundstart music

* Adds In Deep from RA2 into the roundstart music

* A few minor things

Fixes up my plasmagun code so that the projectiles have an
impact_effect, Adds the enclave power armor from Fallout 13 (currently
admin spawn only), and adds a Krotchy doll into the arcade prize list
(Sprites were in Fallout 13's git but I suspect it originated somewhere
else).

* Remove crap

Removing the extra crap so its now just a single-line fix.

* AAAA

ultra-hotfix
 2017-03-19 21:03:37 -04:00
Leon-Leonardo 56d95c0770 citadel.1.2.1 
replaced the base turf of all the outside asteroid sand with the right
turf, hopefully this fixes the hang on loading
replaced all the maint loot spawns with the vanilla one
fixed the area for the lavaland shuttle
fixed the wooden tables of the bar and maint bar
added vents and scrubbers to the port hallway
added firelocks where they were missing
 2017-03-19 18:24:25 -04:00
LetterJayandGitHub e149bde2bb Update tgstation.dme 2017-03-19 14:41:33 -05:00
LetterJayandGitHub f17cd76618 Merge pull request #296 from LetterJay/master 
'Give' verb
 2017-03-19 15:39:01 -04:00
LetterJay d54562b707 fix changelogs/Jay-PR-296.yml 2017-03-19 14:33:20 -05:00
LetterJay 9aa076b316 changelogs/Jay-PR-296.yml 2017-03-19 14:00:41 -05:00
LetterJay 3e294af826 'Give' verb 2017-03-19 13:57:12 -05:00
LetterJayandGitHub 1675d24d71 Merge pull request #282 from katnep/CQC-remastered 
Cqc remastered
 2017-03-19 08:42:08 -04:00
LetterJayandGitHub d843837abf Merge pull request #270 from TalkingCactus/JMP-n-STUFF 
Improved Atmospherics Logging
 2017-03-18 23:42:11 -04:00
LetterJayandGitHub 03ee579f5e Merge pull request #295 from Verkister/master 
It's been a long day okay :v
 2017-03-18 23:36:02 -04:00
Verkister dc18472d72 It's been a long day okay :v 2017-03-19 02:20:04 +02:00
LetterJayandGitHub 6df2e787cd Merge pull request #294 from Verkister/master 
Stealing overlay fix from tg.
 2017-03-18 20:10:33 -04:00
Verkister 1a284fc66d Goddamnit how in the hell did I manage to forget both new wagtails behind views. 2017-03-19 02:05:44 +02:00
Verkister 98cb8767b5 Stealing overlay fix from tg. 
Also forgot one tailwag sprite last time.
 2017-03-19 01:46:56 +02:00
LetterJayandGitHub cf5a0185b2 Merge pull request #292 from Leon-Leonardo/citadel1.2.0 
Citadel Station 1.2.0
 2017-03-18 14:38:49 -04:00
LetterJayandGitHub 1927feddf3 Merge pull request #293 from Verkister/master 
New attempt at fixing shit. Also some sprite stuff.
 2017-03-18 14:38:35 -04:00
Verkister 62705e87f6 git is being a butt again 2017-03-18 14:10:14 +02:00
Verkister df8d69535b New attempt at fixing shit. Also some sprite stuff. 
-Messed around with another air proc I saw runtiming on server.
-Attempted to fix overlays even further. Test run successful but you never know with random chances that hopefully are now as low as the test run let me see.
-Meddled around with transit space. 2 directions were missing a corrective step against negative rng output.
-Added otie snouts.
-Improved contrast in the corvid markings.
-Added tail wag sprites for husky and otie.
 2017-03-18 14:08:10 +02:00
VerkisterandGitHub 00b7dce512 Merge branch 'master' into master 2017-03-18 12:05:51 +02:00
Verkister 81956b0502 Inhand overlays fixed. 
Whoa this succeeded on the first try unlike yesterday's crap :v
 2017-03-18 12:02:50 +02:00
Verkister edc44b2cc5 Overlay fix for the inhand borkage. 
Whoa this thing actually succeeded on the first time unlike yesterday's shit :v
 2017-03-18 11:59:03 +02:00
Leon-LeonardoandGitHub e357748da3 Update citadelstation.dm 2017-03-18 02:39:13 -04:00
Leon-Leonardo fcb52a6893 added teleporter room 
added tracking beacons
added EVEN MORE to maint and made it the standard deathtrap
added carp spawns
added more tunnels to the asteroid exterior
fixed secure workstations access
fixed some fudged wires
fixed some fudged areas
fixed a couple fudged APC's
added plant DNA manipulator
lowered the security of the CMO, RD, and CE offices
added arcade machines
added status displays to cargo
fixed Civ Armory access (for real this time)
reworked the bar/kitchen/casino area
gave the Kinkmate a home
added windows to EVA
 2017-03-18 00:57:11 -04:00
LetterJayandGitHub 3f29a01970 Merge pull request #291 from Citadel-Station-13/revert-286-revert-284-revert-281-master 
Revert "Little but possibly hella important fixes"""
 2017-03-17 23:54:21 -04:00
LetterJayandGitHub 9ce20fae93 Revert "Revert "Revert "Little but possibly hella important fixes""" 2017-03-17 22:44:45 -05:00
LetterJayandGitHub 646c0c245d Merge pull request #290 from Citadel-Station-13/revert-289-master 
Revert "Overlay fix"
 2017-03-17 23:44:07 -04:00
LetterJayandGitHub e41e97a9e9 Revert "Overlay fix" 2017-03-17 22:43:41 -05:00
LetterJayandGitHub e4a33fa115 Merge pull request #289 from Verkister/master 
Overlay fix
 2017-03-17 21:20:45 -04:00
VerkisterandGitHub 3e2cf6ec14 Overlay fix 
This took way too long lmao.
Also manually edited the file in github since doing anything the right way is a goddamn shitfest on this system :v
 2017-03-17 20:13:34 +02:00
LetterJayandGitHub f2937205ac Merge pull request #286 from Verkister/revert-284-revert-281-master 
Revert "Revert "Little but possibly hella important fixes""
 2017-03-16 18:10:42 -04:00
VerkisterandGitHub 8f3d97291a Merge branch 'master' into revert-284-revert-281-master 2017-03-16 23:57:37 +02:00