LetterJay
0a30d7e962
Merge pull request #2646 from Citadel-Station-13/upstream-merge-30466
...
[MIRROR] Fixes drone light toggle while dead
2017-09-10 15:23:45 -05:00
LetterJay
5c4940c832
Merge pull request #2663 from Citadel-Station-13/upstream-merge-30389
...
[MIRROR] Adds a short telegraph to the watcher's blasts
2017-09-09 01:03:15 -05:00
Ashe Higgs
2f438e5f4a
Adds a short telegraph to the watcher's blasts ( #30389 )
...
* Adds a telegraph to the watcher's blasts
* hmm
2017-09-08 10:18:41 -05:00
Militaires
2ab29ccac4
Adds shamebrero penguin for dumb alphonzo ( #30487 )
2017-09-08 10:11:21 -05:00
Poojawa
ce787e7726
Reverts sav file persistance for poly/pun-pun ( #2654 )
...
* Reverts sav file persistance for poly/pun-pun
* makes sure poly writes to poly
2017-09-08 06:58:08 -05:00
Poojawa
62225acc2b
Update verbs.dm
2017-09-08 06:56:31 -05:00
LetterJay
ff219f365e
Update goliath.dm ( #30486 )
2017-09-07 11:58:42 -05:00
kingofkosmos
f4dbb6dc36
Fixes drone light toggle while dead
2017-09-07 10:34:20 -05:00
LetterJay
31102d0ec4
Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
...
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
Ashe Higgs
dcd0fa67f0
Adds "shiny" variants of lavaland mobs ( #30416 )
...
* Shiny lavaland mobs!
* Changes based on feedback
2017-09-06 19:15:25 -05:00
LetterJay
f9ef2bb068
commit
2017-09-06 17:36:32 -05:00
LetterJay
17db844180
another mirror rebase for the PRMirror being down
2017-09-06 17:32:49 -05:00
LetterJay
72a8f7aa54
Merge branch 'master' into upstream-merge-29953
2017-09-06 09:17:57 -05:00
LetterJay
af409af9cf
additional files
2017-09-05 16:29:25 -05:00
LetterJay
bae0563d47
initial commit
2017-09-05 16:17:50 -05:00
Poojawa
362b4b5a16
Fixes Poly ( #2598 )
2017-09-04 09:08:25 -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
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
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
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
bd8a9dc435
Merge pull request #2528
2017-08-29 22:40:00 -07:00
kevinz000
b7e74bd3ab
Merge pull request #2473
2017-08-29 22:27:39 -07:00
kevinz000
f9c0c6df3d
update master
2017-08-29 20:46:38 -07:00
kevinz000
41c1f939ab
gdi
2017-08-29 20:21:41 -07:00
kevinz000
92a2ac0ae3
soft sync
2017-08-29 20:20:11 -07:00
kevinz000
8d0c29f9da
ok
2017-08-29 19:56:27 -07:00
LetterJay
b2114a7b81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-08-29 21:19:22 -05:00
CitadelStationBot
2ff65a8e39
[MIRROR] Lowers the chance for monkeys to become gorillas ( #2476 )
...
* Lowers the chance for monkeys to become gorillas
* Delete life.dm.rej
* Update life.dm
2017-08-29 00:59:34 -07:00
LetterJay
97bee315bf
Update living_defense.dm
2017-08-29 01:50:46 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
7ea6eeb64e
GUHRILLAZ
2017-08-28 10:23:11 -05:00
LetterJay
defab9c7fc
Merge branch 'master' into upstream-merge-29923
2017-08-28 09:19:44 -05:00
LetterJay
03a26e6468
Merge pull request #2518 from Citadel-Station-13/kevinz000-patch-5
...
absolute pathing for mammals
2017-08-28 08:56:55 -05:00
LetterJay
c043b8a1d5
Merge pull request #2495 from Citadel-Station-13/upstream-merge-30182
...
[MIRROR] Holoparasite prompts now have a "Never For This Round" option
2017-08-28 08:46:19 -05:00
CitadelStationBot
bab6b30e02
Splits jungle mob code into separate files
2017-08-28 02:20:39 -05:00
kevinz000
5ebf1c4b6b
Update furrypeople.dm
2017-08-27 19:48:29 -07:00
CitadelStationBot
349bd03b73
Adds periods to larva roars ( #2512 )
2017-08-27 06:42:16 -07:00
CitadelStationBot
94429bdccc
Cleaned up environment_smash vars with bitflag defines ( #2515 )
2017-08-27 05:55:07 -07:00
ktccd
985ea0d768
Sets all food prefs to NONE ( #2517 )
...
People can RP their food likes/dislikes. This stuff, like deciding what
is/isn't edible to slimes and such is unasked for and unecessary.
Also, they didn't address that this stealth-nerfs non-humans as
donk-pockets and such food items were put in a lot of places, expecting
to be used for healing, but can now not be eaten by, for example,
lizards.
2017-08-27 05:54:48 -07:00
kevinz000
68f463452e
Revert "Lets humans use MUTCOLORs [Maximum Heresy]" - turns out this is breaking things ( #2516 )
...
fine ktccd il do it
2017-08-27 04:21:29 -07:00
ktccd
e6114f7840
Makes humans use MUTCOLORS ( #2513 )
...
Exactly what it sounds like. Enables humans to use mutant colours and
disables the preset skintones.
Preset skintones are still doable, since mutant colours can be
accurately adjusted by putting in RGB values for the colours, but it'd
be more manual work. On the other hand, you can now get a more accurate
skin tone...
2017-08-27 00:58:50 -07:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
CitadelStationBot
d38580afcd
Holoparasite prompts now have a "Never For This Round" option
2017-08-26 11:07:20 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
d5dfe45c1e
Dummies no longer queue, which humans probably shouldn't do ever ( #2477 )
2017-08-24 18:30:51 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
