Commit Graph

2034 Commits

Author SHA1 Message Date
LetterJay
92e055be97 Quick sync (#2587)
* sync since the mirror was down

* fucking byond

* can't forget these
2017-09-04 04:38:49 -05:00
CitadelStationBot
d959b7538a Decreases hacked ai module cost (#2557) 2017-09-04 04:14:48 -05:00
CitadelStationBot
32300086d5 [MIRROR] Port material containers to datum components (#2562)
* Port material containers to datum components

* Fixes Rej
2017-09-04 04:08:42 -05:00
Poojawa
a4c92a8155 Update radiation_storm.dm 2017-09-04 03:12:51 -05:00
Poojawa
2c8e2f0679 New tails, new ears, new looks (#2585)
* Sabresune markings and tail

also a few other fixes

* bluh

* kitsune tails and final tweaks

* enables taur on all other species, because why not
2017-09-04 02:48:13 -05:00
Poojawa
8767fa299b Fixes headpatting *wag and Vore spaceworthiness (#2582)
* no you're not supposed to die in a gut

* Re added tailwagging when patted

* adjust sounds, adding belly noises mode

* lowers sounds.

* Adds Noisy belly mode
2017-09-04 02:47:39 -05:00
CitadelStationBot
2ab11de906 [MIRROR] Removes a Redundant Check (#2572)
* Removes a Redundant Check

* Removes redundant check
2017-09-04 02:41:41 -05:00
CitadelStationBot
ad43c951b8 [MIRROR] Slime people can eat anything again (#2568)
* Slime people can eat anything again

* slimes can eat. Furry food prefs
2017-09-04 02:41:15 -05:00
kevinz000
c00d7aa3f6 Update ears.dm (#2489) 2017-09-04 02:39:20 -05:00
CitadelStationBot
9b00f12ba0 Makes the shuttle code a little bit more robust by removing a snowflake loop (#2559) 2017-09-04 01:36:00 -05:00
CitadelStationBot
e7a6c2d09f [MIRROR] Fixes anti-drop exploit (#2589)
* Fixes anti-drop exploit

* Update augments_internal.dm
2017-09-03 14:59:30 -07:00
LetterJay
e0eeda1f63 really fixes guilmons this time 2017-09-03 11:37:15 -05:00
LetterJay
7aa042cff1 Update randomverbs.dm 2017-09-02 07:33:45 -05:00
LetterJay
7711b73ca7 Update randomverbs.dm 2017-09-02 07:31:52 -05:00
LetterJay
a94ffca643 Update admin.dm 2017-09-02 07:28:33 -05:00
LetterJay
f4b08d32a7 Update admin.dm 2017-09-02 07:26:16 -05:00
LetterJay
3e0ead1204 Merge branch 'master' into upstream-merge-29105 2017-09-02 07:11:32 -05:00
LetterJay
2bfc7872fa cleanup 2017-09-02 07:06:37 -05:00
LetterJay
fed956efec Update job_exp.dm 2017-09-02 06:56:35 -05:00
LetterJay
74307f2858 Update preferences.dm 2017-09-02 06:55:52 -05:00
LetterJay
7fea74994f Update randomverbs.dm 2017-09-02 06:53:49 -05:00
LetterJay
d8679dbfcf Prevents hallucinations revealing people's identity 2017-09-02 05:33:55 -05:00
LetterJay
5d1c2c523b Fixes no drop implant 2017-09-02 05:31:15 -05:00
LetterJay
96c790a81f Unruntimes fdel on savefiles 2017-09-02 05:23:35 -05:00
LetterJay
b1302230c0 Merge pull request #2560 from Citadel-Station-13/upstream-merge-30121
[MIRROR] Converts npc saves to jsons
2017-09-02 05:20:31 -05:00
LetterJay
a6aa71e0b9 commit 2017-09-01 09:52:29 -05:00
CitadelStationBot
9e90d582e5 Fixes dummy unequip runtimes. 2017-08-31 08:39:56 -05:00
CitadelStationBot
c2a792d577 Converts npc saves to jsons 2017-08-30 08:01:36 -05:00
kevinz000
28ea6f3ad2 Merge pull request #2499 2017-08-29 22:43:54 -07:00
kevinz000
874bad1203 Merge pull request #2524 2017-08-29 22:40:05 -07:00
kevinz000
cf93e511ce Merge pull request #2527 2017-08-29 22:40:02 -07:00
kevinz000
bd8a9dc435 Merge pull request #2528 2017-08-29 22:40:00 -07:00
kevinz000
fa91df9ef8 Merge pull request #2548 2017-08-29 22:39:00 -07:00
kevinz000
f982cd1d5a Merge pull request #2550 2017-08-29 22:38:54 -07:00
kevinz000
b340bb0851 Merge pull request #2551 2017-08-29 22:38:51 -07:00
kevinz000
ae59532c0d Merge pull request #2552 2017-08-29 22:38:30 -07:00
kevinz000
d5296e65a8 Merge pull request #2554 2017-08-29 22:38:20 -07:00
kevinz000
8693a933b4 Merge pull request #2482 2017-08-29 22:27:42 -07:00
kevinz000
b7e74bd3ab Merge pull request #2473 2017-08-29 22:27:39 -07:00
kevinz000
967dd49261 Merge pull request #2467 2017-08-29 22:27:36 -07:00
kevinz000
9cb65df70d Merge pull request #2426 2017-08-29 22:27:21 -07:00
kevinz000
7549fb09fa Merge pull request #2416 2017-08-29 22:27:19 -07:00
kevinz000
25e1a78b51 Merge pull request #2407 2017-08-29 22:27:13 -07:00
kevinz000
5c7b743cfa Merge pull request #2405 2017-08-29 22:27:10 -07:00
kevinz000
5dc670e282 Merge pull request #2401 2017-08-29 22:27:07 -07:00
kevinz000
fcddd32703 Merge pull request #2195 2017-08-29 22:26:58 -07:00
kevinz000
f33f543d8a Merge branch 'master' into upstream-merge-30254 2017-08-29 22:12:34 -07:00
kevinz000
0925cb108b wew 2017-08-29 22:09:42 -07:00
kevinz000
408acdd66d sync 2017-08-29 22:05:16 -07:00
kevinz000
175224c5de Merge branch 'master' into upstream-merge-29859 2017-08-29 21:14:45 -07:00