Ghommie
99e9280eaf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178
2019-10-07 21:41:04 +02:00
Linzolle
e009a4cc3d
Revert "pooj fixed this anyway"
...
This reverts commit 6ce8db8d7b
2019-10-05 22:15:48 -05:00
Ghommie
32a73b24c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-10-05 18:22:43 +02:00
Linzolle
4fc9385e44
oops
2019-10-05 10:40:31 -05:00
Linzolle
6ce8db8d7b
pooj fixed this anyway
2019-10-05 10:38:17 -05:00
Poojawa
0482973e8f
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 22:38:12 -05:00
and Fermi
4b6d996416
Merge branch 'master' into Blind-quirk-without-anger
2019-10-01 08:41:12 +01:00
kevinz000 and GitHub
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
Poojawa
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
Poojawa
f57bdc39a2
I still fucking hate components.
2019-09-23 02:03:37 -05:00
Poojawa
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
kevinz000 and GitHub
5608d37fd5
Merge pull request #9263 from Trilbyspaceclone/batter_up
...
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
kevinz000 and GitHub
3e899e59f9
Merge pull request #9283 from Trilbyspaceclone/removal
...
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
kevinz000 and GitHub
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
Ghommie
300c572886
Added work boots and bananium clown shoes inhands, more fixes. ready.
2019-09-15 18:21:48 +02:00
Ghommie
89360c3574
Fixes clown shoes and work boots.
2019-09-15 17:56:20 +02:00
Poojawa
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
kevinz000 and GitHub
c4f5ce67b8
Merge pull request #9276 from Trilbyspaceclone/war_on_fashen
...
Adds clip on pokadoted pants, only in 4 types for now
2019-09-13 10:43:00 -07:00
TrilbySpaceClone
626e525d24
..?
2019-09-12 23:36:59 -04:00
TrilbySpaceClone
6a36e5a317
huh
2019-09-12 23:26:07 -04:00
TrilbySpaceClone
ef4b5c1b34
gone_reduced_to_atoms
2019-09-12 23:06:46 -04:00
Ghommie
e987eb27b9
Adjusting a few dozen suits' body coverage.
2019-09-12 23:56:50 +02:00
TrilbySpaceClone
fa868ce4ff
fashen crime
2019-09-11 14:22:50 -04:00
a751a73113
Apply suggestions from code review
...
thx Ceb
Co-Authored-By: cebutris <cebutris2000@gmail.com >
2019-09-10 18:52:49 -04:00
TrilbySpaceClone
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
and Fermi
1e454ff1a7
Merge branch 'pr/25' into Blind-quirk-without-anger
2019-09-08 03:29:22 +01:00
Linzolle
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
Linzolle
b36caabfe6
taur fixes
2019-09-05 12:47:55 -05:00
nik707 and GitHub
c826e1b412
Merge pull request #9175 from lolman360/master
...
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
2019-08-31 02:06:33 -05:00
nik707 and GitHub
4f9b901a97
Merge pull request #9158 from Citadel-Station-13/kevinz000-patch-73
...
Rebalances the MASONrig
2019-08-29 19:06:04 -05:00
nik707 and GitHub
9a0b6a21f9
Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64
...
Amber alert ERTs no longer get pulse weapons
2019-08-28 13:05:56 -05:00
nik707 and GitHub
8e40e9d887
Merge pull request #9186 from Sishen1542/walklikeanegyptian
...
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
2019-08-28 00:02:39 -05:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
Sishen
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
lolman360 and GitHub
c618ce114d
Ebb
2019-08-22 14:18:49 +10:00
Poojawa
32c7a7c3ee
Virology's broken as fuck, damnifino why
2019-08-21 03:36:40 -05:00
Poojawa
96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
Sishen
ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
Poojawa
cede93299e
REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
2019-08-19 04:48:37 -05:00
kevinz000 and GitHub
86cb735cc9
Merge branch 'master' into kevinz000-patch-64
2019-08-18 23:41:40 -07:00
kevinz000 and GitHub
47dd8d22eb
Merge pull request #9149 from Trilbyspaceclone/padding_and_such
...
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
2019-08-18 23:37:56 -07:00
kevinz000 and GitHub
3ef29bbbeb
Merge pull request #9097 from lolman360/durathread
...
Adds durathread.
2019-08-18 23:37:07 -07:00
kevinz000 and GitHub
8a96b29ef9
Merge pull request #9137 from Sishen1542/the-d-boiz
...
addition of the "assistant response team" a pack of assistants sent in from CComm
2019-08-18 23:34:49 -07:00
kevinz000 and GitHub
17a522300c
Update hardsuit.dm
2019-08-18 20:05:42 -07:00
kevinz000 and GitHub
2c000636dd
Update hardsuit.dm
2019-08-18 07:24:58 -07:00
TrilbySpaceClone
2b08b97f1d
yay
2019-08-17 23:54:50 -04:00
TrilbySpaceClone
e69d27f9eb
Traitor armor
2019-08-17 20:36:47 -04:00
Poojawa
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -05:00
Poojawa
725a8046e1
just need items to actually have their overlays, ree
2019-08-17 04:50:24 -05:00
Poojawa
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
Ghommie