6dfb22ea47
Update preferences_savefile.dm
2019-09-11 17:58:32 -05:00
0ac3a2307d
Update wings.dm
2019-09-11 17:48:57 -05:00
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
e6ac254ded
Automatic changelog generation for PR #9260 [ci skip]
2019-09-11 05:26:55 -05:00
f4bff19592
Merge pull request #9260 from dapnee/trim-decals
...
Ports trim decals
2019-09-11 03:26:47 -07:00
df8b4c86ae
Automatic changelog generation for PR #9147 [ci skip]
2019-09-11 00:06:38 -05:00
ff0c3ee844
Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
...
The art of drunken captaining
2019-09-10 22:06:36 -07:00
e9a4e732c0
Automatic changelog generation for PR #9077 [ci skip]
2019-09-11 00:04:51 -05:00
076b6c8699
Merge pull request #9077 from Sishen1542/id-boingo
...
No ID insertion for everything except the hop console
2019-09-10 22:04:48 -07:00
fcce5f976f
Automatic changelog generation for PR #9247 [ci skip]
2019-09-10 12:27:43 -05:00
829a2615c5
Merge pull request #9247 from Thalpy/QuantFix
...
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
8a1e097ba7
Merge pull request #9243 from BlackMajor/Doggo-sit
...
Updates dogborg sprites and some.
2019-09-09 17:54:19 -07:00
7ef06427c5
Removes the medihound red crosses
2019-09-10 11:07:54 +12:00
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
ef700e77d9
Merge pull request #9266 from BlackMajor/master
...
In an extremely convoluted manner, resolves a merge conflict.
2019-09-09 09:39:48 -07:00
2db95cf164
Yes this is how github works.
2019-09-09 21:16:06 +12:00
ede9716d98
Yeet
2019-09-09 21:12:40 +12:00
9d32f5a6cd
Merge pull request #11 from Citadel-Station-13/master
...
Just updating my master
2019-09-09 21:11:21 +12:00
e1e6496976
Me no comprendo github conflicts right now
2019-09-09 21:08:24 +12:00
54edb7553a
Thank you github very cool
2019-09-09 21:02:32 +12:00
683f46a051
Fuck
2019-09-09 20:57:32 +12:00
574d41ff09
This better work
2019-09-09 20:55:23 +12:00
8239f28944
FINE WE'LL DO IT YOUR WAY
2019-09-09 20:54:20 +12:00
ce962490e3
Dab on merge conflict part 2
2019-09-09 20:52:08 +12:00
a29fc4205f
Dab on merge conflict part 1
2019-09-09 20:51:01 +12:00
c824f4a6fe
Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross
2019-09-09 20:38:51 +12:00
dbb4e43c17
Merge pull request #9264 from Citadel-Station-13/BlackMajor-patch-1
...
Discord invite was invalid, updates it.
2019-09-08 22:18:54 -07:00
f1fafb7f5f
Discord invite was invalid, updates it.
2019-09-09 17:17:28 +12:00
97d511b0b8
Automatic changelog generation for PR #9249 [ci skip]
2019-09-08 18:49:46 -05:00
11846849cf
Merge pull request #9249 from Trilbyspaceclone/patch-224
...
Clean bot now cleans Cumstains, glitter, tiny glass shards and more!
2019-09-08 19:49:44 -04:00
bfbf9f2492
Merge pull request #9254 from Citadel-Station-13/gloria-plushie
...
Adds Gloria Redwood plushie as well as heichou's plushies.
2019-09-08 19:47:50 -04:00
17e15da98e
Automatic changelog generation for PR #9256 [ci skip]
2019-09-08 18:46:10 -05:00
de055fe289
Merge pull request #9256 from Thalpy/INFINITE-FERMIES
...
[Consider speedmerging] Fixes the infinite clone problem.
2019-09-08 19:46:08 -04:00
42abad4c63
Merge pull request #9261 from Citadel-Station-13/kevinz000-patch-81
...
[s] fixes a bug
2019-09-08 14:25:22 -05:00
7843e070ff
Update mob.dm
2019-09-08 12:13:24 -07:00
9f275ebf01
Ports trim decals
...
## About The Pull Request
So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.
## Changelog
🆑
add: Trim lines!
/🆑
2019-09-08 10:51:05 -06:00
033057d380
OOPS
2019-09-08 02:55:40 +01:00
e793c1abcb
Delete plushes (2).dmi
2019-09-07 17:15:27 -07:00
0abef923b4
Add files via upload
2019-09-07 17:14:47 -07:00
cfdbb54245
Add files via upload
2019-09-07 17:13:59 -07:00
3e9d37e70d
Update plushes.dm
2019-09-07 17:13:21 -07:00
cd4403911b
Delete plushes.dmi
2019-09-07 17:03:27 -07:00
b8374feafd
Update plushes.dm
2019-09-07 17:03:06 -07:00
ff048df797
Automatic changelog generation for PR #9248 [ci skip]
2019-09-07 13:50:36 -05:00
28aac1d779
Merge pull request #9248 from Trilbyspaceclone/warcrime!
...
NT/Synda* no longer commits war crimes back on Earth
2019-09-07 11:50:33 -07:00
4b66c7af85
Automatic changelog generation for PR #9238 [ci skip]
2019-09-07 13:37:15 -05:00
8f577e910a
Merge pull request #9238 from Trilbyspaceclone/surgery_stuff
...
Adds two more surgerys - Embalming and Body Rejuvenation
2019-09-07 11:37:13 -07:00
2c006004e6
Automatic changelog generation for PR #9229 [ci skip]
2019-09-07 13:35:57 -05:00
4d805331df
Merge pull request #9229 from Trilbyspaceclone/patch-220
...
Gives emags 5 more uses on buy
2019-09-07 11:35:55 -07:00
b2a1aa54c4
Automatic changelog generation for PR #9089 [ci skip]
2019-09-07 13:35:12 -05:00
Poojawa