nik707
8d363b8e9d
Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85
...
adds poll ignore for magical antagonists
2019-11-20 23:03:39 -06:00
kevinz000
8df8acb1b7
Merge pull request #9811 from Ghommie/Ghommie-cit353
...
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
kevinz000
6909857e04
Merge pull request #9632 from Ghommie/Ghommie-cit281
...
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
Ghommie
358db4f390
Dreamchecker compatibility changes, part 2.
2019-11-14 14:54:12 +01:00
Ghommie
100a87d57b
Unmodularize configuration, _globalvars and subsystems.
2019-11-02 20:42:01 +01:00
kevinz000
57f848ab01
Merge branch 'master' into kevinz000-patch-85
2019-10-29 21:19:49 -07:00
Ghommie
4aa1d55abb
Porting multi-z support updates.
2019-10-27 16:32:32 +01:00
Poojawa
184e81eec0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-16 01:51:51 -05:00
Ghommie
3671755142
My cat resting on my neck is just sooo warm, like a best scarf.
2019-10-14 06:06:25 +02:00
Poojawa
bcb11a471d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-13 19:14:16 -05:00
r4d6
fef7dd4ac5
Update flavor_misc.dm
2019-10-10 20:32:22 -04:00
kevinz000
aab93989fb
Update poll_ignore.dm
2019-09-28 00:26:09 -07:00
kevinz000
780586aaf5
Update poll_ignore.dm
2019-09-20 16:03:27 -07:00
kevinz000
17542be05b
Update poll_ignore.dm
2019-09-20 16:00:21 -07:00
Poojawa
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
Poojawa
bf3d30c0e4
Seperates Insect fluff from wings
...
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
Poojawa
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
Poojawa
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
nik707
bfd17d66cd
Merge pull request #9074 from Citadel-Station-13/donator_grouping
...
Donator grouping system
2019-08-29 18:31:23 -05:00
Poojawa
bda3ac8745
blood dna is fixed, your ERP code is too
2019-08-20 07:41:50 -05:00
Poojawa
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -05:00
kevinz000
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07:00
Poojawa
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
Raptorizer
d16ee247a0
Update maintenance_loot.dm
...
Double the amount of peaches that spawn within Maintenance
2019-08-15 07:24:09 -05:00
Raptorizer
a6d10885ec
Revert "Update maintenance_loot.dm"
...
This reverts commit 087bca85e8
2019-08-15 07:11:57 -05:00
Raptorizer
087bca85e8
Update maintenance_loot.dm
...
Double the amount of canned peaches that spawn within maintenance
2019-08-15 07:08:27 -05:00
kevinz000
277971971f
s
2019-08-07 13:07:38 -07:00
Fermi
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
Sishen
1a92134ad3
b
2019-07-25 21:43:02 -04:00
Thalpy
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
Ghommie
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
Thalpy
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
kevinz000
b153294a24
Merge pull request #8857 from Ghommie/Ghoomie-cit127
...
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
Thalpy
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
Ghommie
92fadcf230
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84
2019-07-11 09:07:11 +02:00
Ghommie
ba7c24a0ec
Refactoring underwear to allow custom color preferences.
2019-07-09 23:25:54 +02:00
Thalpy
8a6e669060
Merge branch 'master' into master
2019-07-04 03:14:29 +01:00
kevinz000
bce4ce31ab
Merge pull request #8778 from Ghommie/Ghommie-cit97
...
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-07-03 13:47:04 -07:00
TrilbySpaceClone
9d6c930b2c
owo
...
Wat dis?
2019-06-30 15:47:45 -04:00
Thalpy
696d879874
Merge branch 'master' into master
2019-06-29 15:48:25 +01:00
Ghommie
ad3b709c40
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
2019-06-29 06:39:21 +02:00
Ghommie
0371a5513a
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-06-29 06:03:57 +02:00
Ghommie
a2d896351b
Sort of porting "Changes the type pathing of some "random" items"
2019-06-23 07:10:11 +02:00
Ghommie
b85d4d6fb3
Sort of porting MRE rations from Yogstation.
2019-06-22 16:05:03 +02:00
Fermi
6b9becce71
Merge branch 'pr/14'
2019-06-14 21:29:04 +01:00
SkullyRoberts
e83365daed
Added a penis autosurgeon as rare maint loot
2019-06-08 17:12:51 -04:00
kevinz000
1488af1a52
Merge pull request #8554 from Ghommie/Ghommie-cit33
...
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
2019-06-08 01:24:59 -07:00
Ghommie
0b53df47de
Enough clowning around.
2019-06-07 03:22:26 +02:00
SkullyRoberts
5482469a86
Added lightup shoes and heelys to maint loot
2019-05-30 13:02:18 -04:00
Fermi
ac8b7be45c
Merges old penis enlargement pills into prexisiting Fermichem ones. (master ( #8319 ) by BurgerLUA)
2019-05-10 03:10:42 +01:00
