shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,942 Commits 5 Branches 0 Tags
558a989d8a957504ea3fe0e1a5b3f21ba34e8597
Commit Graph

12374 Commits

Author SHA1 Message Date
kevinz000
2a8fcb3929 Update chameleon.dm 2017-03-26 01:31:57 -07:00
kevinz000
22cc36345f Update chameleon.dm 2017-03-26 01:30:32 -07:00
Poojawa
a8d181c00c Update admin_verbs.dm (#314) 
Enables moderator staff to issue controller restarts
 2017-03-25 14:52:44 -05:00
LetterJay
fee5a75274 double fuck 2017-03-24 02:15:02 -05:00
LetterJay
e07580413f fuck 2017-03-24 02:08:02 -05:00
LetterJay
1d518bb4dd updates maploader, fixes a few things 2017-03-24 01:39:11 -05:00
TalkingCactus
091e622da7 that's it, we're done. go home everyone 2017-03-24 00:32:44 -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
TalkingCactus
fcc5e0e2f5 fixes preview icon runtimes+ (#304) 2017-03-21 21:22:47 -05:00
Poojawa
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-RL
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
TaxMaster
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
LetterJay
3e294af826 'Give' verb 2017-03-19 13:57:12 -05:00
LetterJay
1675d24d71 Merge pull request #282 from katnep/CQC-remastered 
Cqc remastered
 2017-03-19 08:42:08 -04:00
LetterJay
d843837abf Merge pull request #270 from TalkingCactus/JMP-n-STUFF 
Improved Atmospherics Logging
 2017-03-18 23:42:11 -04:00
Verkister
98cb8767b5 Stealing overlay fix from tg. 
Also forgot one tailwag sprite last time.
 2017-03-19 01:46:56 +02: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
Verkister
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
LetterJay
9ce20fae93 Revert "Revert "Revert "Little but possibly hella important fixes""" 2017-03-17 22:44:45 -05:00
LetterJay
e41e97a9e9 Revert "Overlay fix" 2017-03-17 22:43:41 -05:00
Verkister
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
Verkister
8f3d97291a Merge branch 'master' into revert-284-revert-281-master 2017-03-16 23:57:37 +02:00
Verkister
2158168a4a Merge branch 'master' into master 2017-03-16 09:22:32 +02:00
Verkister
545dec9826 Revert "Revert "Little but possibly hella important fixes"" 2017-03-16 09:14:53 +02:00
Verkister
429e101e5d Another attempt at fixing air.dm 
I found out the process_cell proc did exist, but it's for turfs only. The runtiming call for it had no proper exclusion. No idea if this works, but the test runs showed no problems so far.
 2017-03-16 09:03:18 +02:00
LetterJay
ed435e7e2f Revert "Little but possibly hella important fixes" 2017-03-15 20:20:22 -05:00
LetterJay
be00b14221 Merge pull request #281 from Verkister/master 
Little but possibly hella important fixes
 2017-03-15 21:02:12 -04:00
ktccd
be0e52c2f0 Borer_chem_lewd_update (#276) 
* Borer_chem_lewd_update

Added aphrodisiac and anaphrodisiac to the borer chemical list. Default
costs for now.

* Cloning-genitalia

Previously, clones had DNA for genitals, but not the organs. This should
give organs to any creature that has the DNA for them.

* Revert "Cloning-genitalia"

This reverts commit 67cac7775f1d8813638d3e77daaeed768822dfee.
 2017-03-15 10:42:07 -04:00
Verkister
41d47301dd Separated the goddamn overlay direction quirk between mobs and turfs since apparently they both misused the same shit in a different way, conflicting like crap! 2017-03-15 13:52:39 +02:00
Verkister
bb879dfac8 -Fixes overlay stuff such as character creation preview. (one of main runtime issues out there currently) 
-Probably fixes a missing proc with air runtimes too, which has been one of the problemos appearing in tandem with MC borkage (next line under was MC related anyway)
-Husky tail wag sprites renamed correctly (inverted color order). Actual movement yet to come.
 2017-03-15 10:52:00 +02:00
katnep
4144a627d7 tweaking the file 
trying to get it to show up in traitor since it wasn't showing up after
deleting the nuclear tag
 2017-03-14 20:11:57 +00:00
katnep
5e9602265b adds CQC to the traitor mode items 
Adds the CQC manual from the nuke ops uplink to be included in the
traitor uplink since sleeping carp is on traitor and is significantly
more powerful where as CQC is more intent cycling and reactions so i
think it offers a varied play style oppurtunity for those who don't want
to take sleeping carp but like the martial arts aesthetic
 2017-03-14 19:53:44 +00:00
TalkingCactus
51d20e13ef Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into JMP-n-STUFF 2017-03-10 12:56:18 -05:00
TalkingCactus
09ec454325 Random Fixes + Dildos (#268) 
* I'LL SNEAK THIS IN, TOO

* will it blend

* event tweaking

* new kinkmate sprite

* savefile bugfixes

* drinks got overwritten again

rip

* replaces missing styles

* dildos

* last bit
 2017-03-10 12:51:16 -05:00
TalkingCactus
097557de4b do it better 2017-03-10 12:47:28 -05:00
TalkingCactus
906b8e59d0 disables flight suits, again (#265) 2017-03-06 16:59:57 -05:00
TalkingCactus
733ca2716d I'm retarded 2017-03-06 15:58:37 -05:00
TalkingCactus
2adf4e26c8 disables suicide 
was overwritten in an update
 2017-03-06 15:56:15 -05:00
TalkingCactus
3a1d69cc63 Fixes Lattice Building (#263) 
* allows construction of lattices again

https://github.com/tgstation/tgstation/pull/24674

* removes stray brig shutter from engineering windows
 2017-03-05 06:51:18 -05:00
TalkingCactus
89a87f6ee5 send it, captain (#262) 
confirmation confirmed, sending package
 2017-03-05 04:30:46 -05:00
LetterJay
f0ad0ac08b sql fix 2017-03-04 05:26:43 -06:00
TalkingCactus
97327d2beb Hotfixes for March 3, 2017 (#260) 
* fixes sterile mask box

* fixes admin map templates

https://github.com/tgstation/tgstation/pull/24581

* syndicate beacon refactor

https://github.com/tgstation/tgstation/pull/24612

* singularity tracking

https://github.com/tgstation/tgstation/pull/24609

* puddle description

https://github.com/tgstation/tgstation/pull/24601

* aux base landing fix

https://github.com/tgstation/tgstation/pull/24594

* comms console cooldown

https://github.com/tgstation/tgstation/pull/24579

* cult fixes + pronouns

https://github.com/tgstation/tgstation/pull/24590

* minebots now check for pressure

https://github.com/tgstation/tgstation/pull/24604

* fixes a very annoying spawn

https://github.com/tgstation/tgstation/pull/24588

* fixes false positive AI cheat check

https://github.com/tgstation/tgstation/pull/24558
mso is bae

* Fixes abductor surgery designs

https://github.com/tgstation/tgstation/pull/24593

* Allows transit space shuttle repairs

https://github.com/tgstation/tgstation/pull/24582

* fixes indentation error
 2017-03-03 15:15:42 -05:00
TalkingCactus
84578c35cd New Sounds for Emitters, Fire Alarms, Sparks, and Maintenance Ambience (#258) 
* new sparks sound

* new emitter sound

* new maintenance sounds

* non-overlapping fire alarm sound

* volume tweaking
 2017-03-03 00:53:17 -05:00
Poojawa
b26c52ebd2 Fixes vendies and glasses (#257) 2017-02-28 23:10:46 -06:00
Poojawa
768c644638 Reverts admin ticket system (#256) 
* Reverts admin ticket system

Way too buggy right now.

* I guess dme is a thing
 2017-02-28 23:10:37 -06:00
LetterJay
93fcc0d99f Merge pull request #255 from LetterJay/master 
removes replace_text for them/their to his/her
 2017-02-28 22:46:28 -05:00
LetterJay
cf680a63d2 changes most, if not all, the send2irc_adminless_only to send2irc 2017-02-28 21:40:52 -06:00