Commit Graph

370 Commits

Author SHA1 Message Date
kevinz000
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
nik707
8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456
Minor underwear fixes and tweaks.
2019-12-30 18:28:48 -06:00
Seris02
9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
Putnam3145
640419eed5 Merge pull request #10343 from Ghommie/Ghommie-cit494
[s] Fixes anti-ghost-role vars a little.
2019-12-29 20:54:55 -08:00
Ghommie
0ab817c208 [s] Fixes ghost anti-ghostrole timers a little. 2019-12-29 22:22:20 +01:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
shellspeed1
1875ea3f58 new wings and fluff 2019-12-21 23:47:41 -08:00
Ghommie
395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Ghommie
ba851d55b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456 2019-12-18 19:42:41 +01:00
Lin
237fbaa02d Merge pull request #10180 from Ghommie/Ghommie-cit462
[s] virtual reality component improvements, fixes and documentation.
2019-12-17 01:05:10 +00:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
kevinz000
586dcb6f81 welp i got lazy 2019-12-15 00:15:32 -07:00
Unknown
73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07:00
Ghommie
3891c91799 virtual reality component improvements, fixes and documentation. 2019-12-14 17:19:48 +01:00
Ghommie
c098d497ad Minor underwear fixes and tweaks. 2019-12-13 06:50:14 +01:00
Ghommie
3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01:00
Unknown
33854e8fd8 Adds a huge amount of Christmas clothes 2019-11-27 20:07:39 -07:00
Ghommie
f9680130f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-27 18:48:20 +01:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Ghommie
911a33bfd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387 2019-11-21 06:36:59 +01:00
Ghommie
dccb3c2e22 part 3 2019-11-21 06:36:22 +01:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie
7a1f3dcdba Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor. 2019-11-15 23:14:28 +01:00
Ghommie
f401e622c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-15 01:01:08 +01:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
kevinz000
af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
2019-11-14 15:47:18 -07:00
Ghommie
358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
kevinz000
4e3147b228 Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
2019-11-12 23:59:31 -07:00
Ghommie
c5a7c28a1b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-12 16:04:05 +01:00
Ghommie
4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Ghommie
279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00
Ghommie
298f2e02c6 Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron. 2019-11-08 22:33:26 +01:00
Ghommie
892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
a5086d5813 3 seconds penalties fix 2019-10-29 13:16:36 +01:00
Ghommie
4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
kevinz000
969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw
Adds posibrains to the spawners menu for ghosts.
2019-10-24 18:45:57 -07:00
ItzGabby
25e426ddd0 Adds new parts for anthromorphs
Adds bat ears, bat marking, bat tails (Two variants and animation included), and new alternative snouts. Also cleans up the wing selection menu to be alphabetic, because, it was horrific to look at.
2019-10-23 07:26:01 -04:00
BlackMajor
8b61fe3d72 posibrains on spawn list 2019-10-23 22:46:10 +13:00
Ghommie
ec22088534 Complying with suggestions. Also stops dnr observers from getting ghost role notifications 2019-10-20 09:15:35 +02:00
Linzolle
c0ae39fce1 remove unnecessary things 2019-10-18 12:43:05 -05:00
Linzolle
5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
Ghommie
f73516a17f made it into config. 2019-10-17 04:44:30 +02:00
Ghommie
cffa3f8cea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-10-17 03:09:59 +02:00
kevinz000
6d1035e995 Merge pull request #9491 from Poojawa/wingfix
Fixes missing decorative wing states
2019-10-15 22:59:45 -07:00