ad00e6b36a
Merge branch 'master' into assu
2019-10-28 19:02:48 +03:00
329f86cea0
Merge pull request #9612 from Linzolle/blood-overlay-again
...
fix blood overlays again
2019-10-27 17:21:55 -07:00
203509b405
Poll said its DAB
2019-10-27 16:27:03 +03:00
8fb0a68feb
Adds Hat Throwing ( #45355 )
...
* adds hat throwing on people and borgs
* clothing flags, hats can knock off non-items, borg hat blacklist check
* prevents hats with items in them from being able to land on heads
* removes extra equip, hats can go on the hatless again, tinfoil fix
* if
* bit flag
2019-10-25 16:19:19 -05:00
9e89e898ee
not again
2019-10-25 15:58:10 -05:00
dcb4c6ae04
Merge branch 'master' into assu
...
...and its still coming together...
2019-10-25 10:31:07 +03:00
da502aa31d
Merge pull request #9535 from Ghommie/Ghommie-cit247
...
Fixing sniper rifles scope datum action oddity.
2019-10-24 19:05:25 -07:00
f592aca594
Merge branch 'master' into assu
2019-10-24 17:18:26 +03:00
a50606bb67
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
2019-10-24 10:10:07 +02:00
687d452d67
#44222 , yea sorry for your rework Poojawa.
2019-10-23 16:15:26 +02:00
29f89ac3a9
Merge branch 'master' into assu
2019-10-23 13:32:39 +03:00
7463bbc001
Merge branch 'master' into syntheticbloods
2019-10-21 21:06:18 -05:00
30eafc305c
Merge pull request #9246 from Linzolle/taur
...
[READY] some missing icons + sprite changes for taur suits
2019-10-21 21:19:05 -04:00
2078fdae66
GOD--
...
--DAMN IT!
2019-10-21 16:26:31 +03:00
32d2476112
Moves stuff from modular, updates sprites
...
Also, digitigrade variant is corrected, hopefully.
2019-10-21 15:24:06 +03:00
e991328087
progress
2019-10-19 15:02:56 +02:00
184e81eec0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-16 01:51:51 -05:00
1eccc93137
Oh it's so good
2019-10-15 10:44:35 +01:00
1b170fe2b7
Costume for meee
2019-10-15 10:27:31 +01:00
e009a4cc3d
Revert "pooj fixed this anyway"
...
This reverts commit 6ce8db8d7b
2019-10-05 22:15:48 -05:00
4fc9385e44
oops
2019-10-05 10:40:31 -05:00
6ce8db8d7b
pooj fixed this anyway
2019-10-05 10:38:17 -05:00
0482973e8f
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 22:38:12 -05:00
250c6ed986
Merge pull request #9367 from Poojawa/totally-radical
...
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
2019-10-01 00:12:32 -07:00
9bd6f83034
Applies rad_flags to a lot of common items + bluespace bags
...
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
2019-09-28 03:22:17 -05:00
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
f259d98d7a
Merge pull request #9282 from Ghommie/Ghommie-cit193
...
Fixed a few dozen suits' body coverage inconsistencies.
2019-09-21 01:43:52 -07:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
e987eb27b9
Adjusting a few dozen suits' body coverage.
2019-09-12 23:56:50 +02:00
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
b36caabfe6
taur fixes
2019-09-05 12:47:55 -05:00
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
088bc484e3
Forensics re-destroyed, but better this time.
...
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
d71f37167f
I'm about to go fucking APE
...
None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm
2019-08-16 04:58:16 -05:00
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
0451390778
control click and then drag is easy
2019-08-11 11:16:19 +10:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
438c3253d0
Taur snowflake code makes me sick.
2019-07-31 22:01:05 +02:00
7c9c51b777
Ports "Adds techpriest robes and adds them to the RoboDrobe"
2019-07-31 21:54:55 +02:00
e8584720b3
Fixes suit worn overlay for towels.
2019-07-21 11:18:38 +02:00
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
31bd9104bb
Ports "Adds blueshirt items to sectech and defines them better."
2019-07-13 06:42:09 +02:00
83f84b01a1
Merge pull request #8700 from Sishen1542/trenchcloak
...
Adds a reskin option for HoS tenchcoat, the trenchcloak!
2019-06-28 05:24:11 -07:00
41bd3caf3c
Ports "Reorganizes the uplink, adds grenades and explosives category." ( #8669 )
...
* Ports "Reorganizes the uplink, adds grenades and explosives category."
* Unbent codex, singing the sorrow of aborted spoils.
* .
2019-06-23 06:00:27 -07:00
3fee680f39
rename flag is for pen, my mistake
2019-06-19 16:09:03 -04:00
3211a199af
trenchcloak
2019-06-19 15:57:47 -04:00
Anonymous