Commit Graph

168 Commits

Author SHA1 Message Date
kevinz000
d2398f4584 Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2
Porting agent card updates and registered name fix.
2020-02-15 11:45:39 -07:00
kevinz000
f36b89a6e3 Update misc.dm 2020-02-14 11:53:50 -07:00
kevinz000
efc94565b6 Update misc.dm 2020-02-14 00:40:50 -07:00
kevinz000
e9baf17233 Update misc.dm 2020-02-14 00:40:19 -07:00
Ghom
bcc7949034 Update names.dm 2020-02-13 18:02:42 +01:00
kevinz000
24cbe67f27 optimizations, unnecessary crap, undocumented ipc change 2020-01-24 21:18:19 -07:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie
80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Seris02
a39c0249c4 marshmallow 2019-12-29 21:55:25 +08:00
Ghom
e7cf680ca7 Merge pull request #10266 from shellspeed1/master
New insect marking customization option and three new wings.
2019-12-25 03:43:29 +01:00
shellspeed1
1875ea3f58 new wings and fluff 2019-12-21 23:47:41 -08:00
r4d6
ac1719810f Adding a list for the stations rooms 2019-12-19 15:23:23 -05:00
Ghommie
8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. 2019-12-13 02:30:11 +01:00
kevinz000
b5595114c1 Merge pull request #9805 from Ghommie/Ghommie-cit352
Uplink items are now automatically sorted alphabetically.
2019-12-05 21:40:09 -07:00
Putnam3145
44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
2019-11-30 22:22:52 -08:00
kevinz000
8b56e25d97 Merge pull request #9920 from YakumoChen/ai-sprites
Ports a bunch of VG's AI sprites
2019-11-26 15:59:09 -07:00
YakumoChen
038887e27b Adds new AI display options removes duplicate entry 2019-11-23 04:59:52 +00:00
YakumoChen
6ebab6300a Adds AI icons and fixes the comma. Again. 2019-11-23 04:41:36 +00:00
YakumoChen
6d5c4c3bdb Adds AI core display options 2019-11-23 04:35:50 +00:00
Fermi
7bbc90d747 makes the freezing list a typecache 2019-11-22 23:56:05 +00:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Thalpy
0cce3a01f4 Ghommie's requiem 2019-11-21 19:39:55 +00:00
Ghommie
ee73806616 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit352 2019-11-21 09:18:14 +01:00
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
b48ddb99fc Uplink items are now automatically sorted alphabetically. Fixed categories. 2019-11-14 02:56:26 +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
GrayRachnid
9f8ad74bf9 New traumas and some other things. 2019-10-08 03:53:01 -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