shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
184 Commits 5 Branches 0 Tags
85cd936712ba35725df7395b79fbb65a5b5052a2
Commit Graph

85 Commits

Author SHA1 Message Date
unusualcrow
85cd936712 Tweaks! (#44) 2016-09-17 22:55:06 -04:00
TalkingCactus
9d9a93335b Merge /vore into /master (#39) 
* progress

* Compile errors fixed

No idea if it's test worthy tho as conflicts with race overhaul and
narky removal.

* Update admins.txt

* efforts continue

Fuck grab code, seriously

* grab code is cancer

* Execute the Narkism

Do not hesitate.

Show no mercy.

* holy shit grab code is awful

* have I bitched about grab code

My bitching, let me show you it

* código de agarre es una mierda

No really it is

* yeah I don't even know anymore.

* Lolnope. Fuck grab code

* I'm not even sure what to fix anymore

* Self eating is not an acceptable fate

* Taste the void, son.

* My code doesn't pass it's own sanity check.

Maybe it's a sign of things to come.

* uncommented and notes

* It Works and I Don't Know Why (#38)

* shuttle auto call

* it works and I don't know why
 2016-09-09 23:31:01 -05:00
Poojawa
4a58a0379a Merge pull request #30 from Poojawa/bob-barker 
Bob Barker lessons
 2016-09-04 07:35:30 -05:00
Poojawa
0a2fd60520 Science nerfs (#28) 
* Because No

* Okay not as much no this time

* Cargo is impossible to nerf
 2016-09-04 07:34:46 -05:00
Poojawa
0578a0a122 Based Barker 2016-09-02 08:08:18 -05:00
TalkingCactus
3fdf706248 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-31 20:02:24 -04:00
LetterJay
f69cdb2d8e character save slots to 10 instead of 3 2016-08-31 03:23:07 -05:00
TalkingCactus
02aa672673 alien death rattle 2016-08-30 17:14:08 -04:00
TalkingCactus
058095b2f5 ports https://github.com/tgstation/tgstation/pull/19981 
Special thanks to MrStonedOne.
 2016-08-30 14:13:55 -04:00
TalkingCactus
ea55a53a99 fixes flavor text not saving/displaying correctly 2016-08-28 08:26:50 -04:00
TalkingCactus
6c710d9d7e indentation fix 2016-08-27 10:58:19 -04:00
TalkingCactus
1edc9b8131 fixes mutant colors 2 and three not saving 2016-08-27 10:51:16 -04:00
TalkingCactus
9c58a74d13 defines kegs 2016-08-25 05:37:12 -04:00
TalkingCactus
fd22cdd24d Revert "defines the area and adds the blank map" 
This reverts commit 1b5e674490.
 2016-08-24 18:47:02 -04:00
TalkingCactus
1b5e674490 defines the area and adds the blank map 2016-08-24 18:46:49 -04:00
TalkingCactus
1d7d2ad770 final edits 2016-08-23 22:51:05 -04:00
TalkingCactus
09d4ee3313 fix for missing DNA strings 2016-08-23 22:17:15 -04:00
TalkingCactus
3355240010 let's go farther 2016-08-23 22:06:59 -04:00
TalkingCactus
cad4f97e41 come on /tg/ 2016-08-23 22:05:47 -04:00
TalkingCactus
848b03ba61 consistency and sprite edits 2016-08-23 22:01:05 -04:00
TalkingCactus
05837982d5 typo fix 2016-08-23 22:00:51 -04:00
TalkingCactus
3acf1c02a3 species update 
felines, more bodyparts for mammals
 2016-08-23 20:25:56 -04:00
TalkingCactus
9377971623 fixes xeno species bleeding 2016-08-23 20:25:04 -04:00
TalkingCactus
5af0b6825f hold the phone 2016-08-23 10:08:44 -04:00
TalkingCactus
61fe43d366 ayylmao 2016-08-23 06:11:34 -04:00
TalkingCactus
2e58991958 BREAK'S OVER YOU HOOLIGANS 2016-08-22 09:09:54 -04:00
TalkingCactus
1109319232 can't forget this 2016-08-19 03:37:25 -04:00
TalkingCactus
e2864fb407 we're close 2016-08-19 03:37:10 -04:00
TalkingCactus
0b744a9fcb mam_body_markings functional 2016-08-15 22:07:45 -04:00
TalkingCactus
f838968dcc sprite_accessories 2016-08-15 21:36:09 -04:00
TalkingCactus
2370e36a06 restricts unwanted species 2016-08-15 21:34:31 -04:00
TalkingCactus
ffcd827bb6 organization 2016-08-15 21:34:13 -04:00
TalkingCactus
c78ad999a7 removes insuit examine code 2016-08-15 21:34:02 -04:00
TalkingCactus
bb34c6b05b HISS 2016-08-15 21:33:48 -04:00
TalkingCactus
28f21b2f65 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-15 20:47:59 -04:00
TalkingCactus
d3fe3d73cf from 2016-08-15 20:47:01 -04:00
TalkingCactus
3f53478020 me 2016-08-15 20:46:53 -04:00
TalkingCactus
c4a543a1c7 save 2016-08-15 20:46:45 -04:00
TalkingCactus
53046e6fbc got 'em coach 2016-08-15 20:46:36 -04:00
LetterJay
e722c485ca dupe fix 2016-08-15 15:57:29 -05:00
LetterJay
364628945f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13-6th-Port 2016-08-15 15:49:14 -05:00
LetterJay
e6ae35efd4 should fix the in-suit issue was well as missing flavor text. 2016-08-15 15:49:03 -05:00
TalkingCactus
375535fbee misspelled list 2016-08-15 16:20:08 -04:00
TalkingCactus
465f70d408 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 
# Conflicts:
#	code/modules/client/preferences.dm
 2016-08-15 16:13:36 -04:00
Poojawa
cf48200c69 Admin QoL 
Moves absuive verbs to a seperate panel to reduce likelihood of being
pressed.
 2016-08-15 09:23:25 -05:00
LetterJay
c53fabaf5e fixes taurs 
re-enables taurs
 2016-08-15 00:05:24 -05:00
TalkingCactus
f909ba9fd9 another dump 2016-08-14 14:30:40 -04:00
TalkingCactus
1386dfb9bb removes headcrabs from the gold core 2016-08-14 14:06:39 -04:00
TalkingCactus
48ddeb5725 day 4 dump 2016-08-14 01:00:30 -04:00
TalkingCactus
4eabc390c6 one way or another im gonna find you 2016-08-13 15:59:52 -04:00