58023 Commits

Author SHA1 Message Date
Poojawa
11af060597 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-17 06:58:17 -05:00
Poojawa
f05705da9e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-17 02:07:12 -05:00
TalkingCactus
0b744a9fcb mam_body_markings functional 2016-08-15 22:07:45 -04:00
TalkingCactus
4dffc5c716 icon tweaks 2016-08-15 21:36:16 -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
c321627ec7 h e l l 2016-08-15 20:47:17 -04:00
TalkingCactus
9ee87d4c3f this 2016-08-15 20:47:08 -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
be3cc57be2 misspelled global list 2016-08-15 16:19:56 -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
b7c36f6b72 Merge pull request #20 from Poojawa/admin-qol
Admin qol
2016-08-15 09:24:16 -05: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
Poojawa
3f5302a0c6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-15 05:30:44 -05:00
LetterJay
e34852e32b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13-6th-Port 2016-08-15 00:17:53 -05:00
LetterJay
4fda0af454 changelog 2016-08-15 00:16:56 -05:00
LetterJay
c12dd326f6 Merge pull request #18 from LetterJay/master
Taurs
2016-08-15 01:10:07 -04:00
LetterJay
0dea335be0 changelog 2016-08-15 00:08:12 -05:00
LetterJay
c53fabaf5e fixes taurs
re-enables taurs
2016-08-15 00:05:24 -05:00
Poojawa
c138bc35ae Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-14 13:54:13 -05:00
TalkingCactus
f909ba9fd9 another dump 2016-08-14 14:30:40 -04:00
TalkingCactus
6d8f6481f3 slows down swarmers 2016-08-14 14:22:16 -04:00
TalkingCactus
1386dfb9bb removes headcrabs from the gold core 2016-08-14 14:06:39 -04:00
Poojawa
28d11be7da Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' 2016-08-14 07:27:04 -05: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
TalkingCactus
c0b9616b91 re-adds mam_body_markings 2016-08-13 14:58:52 -04:00
TalkingCactus
5708e26f2e restricts angels 2016-08-13 14:58:41 -04:00
TalkingCactus
77f4705d50 more icon tweaking 2016-08-13 14:58:17 -04:00
TalkingCactus
2c1ea38167 resets BODY_LAYERs 2016-08-13 14:57:21 -04:00
TalkingCactus
3c13348a02 one day 2016-08-12 20:05:18 -04:00
TalkingCactus
4063990e67 removes narky preferences 2016-08-12 19:36:34 -04:00
TalkingCactus
bdca0606a1 comments vore initiation code 2016-08-12 19:36:08 -04:00
TalkingCactus
20d9c82319 defines gender specific bellies 2016-08-12 19:35:53 -04:00
TalkingCactus
ba0715cdff defines race restrictions 2016-08-12 19:35:25 -04:00
TalkingCactus
32ca150fa0 removes narky DNA code 2016-08-12 19:20:30 -04:00
TalkingCactus
eceec27cdb moves procs and constants to code/citadel/_helpers 2016-08-12 19:20:13 -04:00
TalkingCactus
12c830d66c adds organs.dm to code/citadel
can probably just move this to the real organs file later, didn't want
to forget about it
2016-08-12 19:19:46 -04:00
TalkingCactus
9c89be1930 taking a break, here's a dump of what's done so far 2016-08-12 16:00:15 -04:00