Commit Graph

458 Commits

Author SHA1 Message Date
Linzolle
ad200fbb71 a stupid nitpick 2020-12-07 17:52:07 -06:00
silicons
8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
silicons
1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
Cameron!
e3af0d654e Revert "[READY] DRAKEBORGS & PLUSHIES" 2020-09-02 17:47:22 -07:00
Timothy Teakettle
cbe9d05fb6 fuck 2020-08-21 21:08:17 +01:00
Navier
fc70d3dde2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG 2020-08-15 23:13:41 -04:00
Navier
ae14745249 Stupid conflicts coming from closed prs how nice? 2020-08-12 16:50:45 -04:00
Dip
ab2de2e55c Added Skulldoggo Snout 2020-08-08 16:01:37 -03:00
silicons
1fa691d569 ok 2020-07-28 13:24:17 -07:00
silicons
cf6c78985f icons 2020-07-28 11:32:23 -07:00
BlackMajor
ea98bdeca6 done 2020-07-11 23:52:23 +12:00
BlackMajor
f43bdff603 bet? 2020-07-11 16:58:05 +12:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
Ghom
07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) 2020-05-24 13:21:14 -07:00
Kraseo
a7053a978f Ports a tail from the RP server (#12301)
* tailse

* forgot to reorder it lol

* and i guess felinids and anthros can use it too
2020-05-20 18:37:38 -07:00
Ghom
d16c97f06b Taur fixes. (#12248) 2020-05-15 07:16:09 -07:00
kevinz000
5a716bfcfd Merge pull request #12143 from Ghommie/Ghommie-cit729
Demodularizing a few sprite assets.
2020-05-08 23:29:34 -07:00
Ghommie
aaa31c24ce Demodularizing a few sprite assets. 2020-05-08 04:02:31 +02:00
Ghommie
192c0dcc1a Demodularizing the arousal module. 2020-05-08 03:35:29 +02:00
Ghommie
3de0e545c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-05 05:44:55 +02:00
Ghommie
cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-01 22:12:00 +02:00
Ghommie
52aa8fa1ec leftovers. 2020-05-01 19:50:53 +02:00
Ghommie
a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +02:00
ZeroMan
c506d86553 i forgot this thing 2020-04-23 22:40:46 -04:00
ZeroMan
46309b5fec i will eliminate security 2020-04-23 22:29:03 -04:00
Ghommie
5a4fecdeb8 tested and it works now, I'm glad. 2020-04-20 19:22:42 +02:00
Ghommie
e703e12c88 WIP 2020-04-20 16:25:08 +02:00
Ghommie
3bef4b88ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-20 02:29:34 +02:00
Ghommie
fe43581d31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-16 15:09:52 +02:00
Ghommie
586966ea51 General refactor for some snowflake bodyparts procs and taurs. 2020-04-16 03:37:52 +02:00
kevinz000
f460d0dab0 Merge pull request #11831 from Ghommie/Ghommie-cit677
Fixing some sprite accessories offsets, shifted the icon states 2 px down.
2020-04-14 01:33:57 -07:00
Ghommie
616d482cf6 Deleting poly clothes copypasta. 2020-04-13 22:51:46 +02:00
Ghommie
2e2b9cfe1b Fixing some sprite accessories offsets, shifted the icon states 2 px down. 2020-04-12 09:13:44 +02:00
Ghommie
56669f9296 Minor snowflakes clothing variations refactor. Removal of copypasted states. 2020-04-04 00:22:18 +02:00
Seris02
4902d5ab4e makes sergal markings better (#11708) 2020-04-02 14:25:34 +02:00
kevinz000
ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
Ghommie
76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-21 16:04:26 +01:00
kevinz000
cc8d8da0fe Merge pull request #11531 from Ghommie/Ghommie-cit630
Removing some egg-celent unused preferences.
2020-03-20 22:56:19 -07:00
Ghommie
a2b0fd775b Specific sprite accessory icon states improvement. 2020-03-20 00:24:26 +01:00
Ghommie
eeab3ed11f Everyday 2020-03-19 17:34:01 +01:00
Seris02
68382d65c8 normalising wagging tail names 2020-03-09 17:48:12 +08:00
deathride58
e08669e8a1 Ports Virgo's synthetic taursprites, adds taur to synthliz mutant bodyparts 2020-03-06 00:15:37 -05:00
deathride58
519de6a83d while im at it - Improves the appearance of the antenna synth antenna by slimming down the south-facing and north-facing side of the synth head sprite and moving the antennae closer together by one pixel 2020-03-03 16:12:33 -05:00
deathride58
560192c45a Does the thing - PORTS THE BEEPERS! also fixes a bug where body markings dont render if their name doesnt match the iconstate 2020-03-03 15:49:25 -05:00
YakumoChen
3914c5522a TWOCAT 2020-02-24 05:33:40 -05:00
YakumoChen
495db5f09f OH GOD CATSPLOSIONN 2020-02-24 05:18:36 -05:00
YakumoChen
b7fd779f18 OH GOD CATSPLOSION 2020-02-24 04:59:52 -05:00
Ghommie
1a0fba8a2a Something about consistency and magnetic rifles. 2020-02-16 18:37:51 +01:00