 Kraseo
|
ad20fb1a0e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-06 11:58:11 +01:00 |
|
|
kevinz000
|
16d6ba9e21
|
Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
|
2020-03-06 00:17:21 -07:00 |
|
|
kevinz000
|
23fa750e31
|
Merge pull request #11324 from Trilbyspaceclone/patch-302
Makes medical hardsuits have built in huds
|
2020-03-06 00:17:09 -07:00 |
|
|
Trilbyspaceclone
|
1c310f6cee
|
Update hardsuit.dm
|
2020-03-04 13:01:25 -05:00 |
|
|
Ghommie
|
f2c8a7cd6f
|
Porting a couple material datums code updates and fixes.
|
2020-03-04 15:59:46 +01:00 |
|
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
|
Kraseo
|
4315a4d1b7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-02 23:06:29 +01:00 |
|
|
Ghom
|
c984cd7677
|
Merge pull request #11270 from ancientpower/paramedic-tweaks
Paramedic tweaks (sprites/access/stuff for future use)
|
2020-03-02 22:46:49 +01:00 |
|
|
Kraseo
|
50a1feeb89
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-02 17:38:08 +01:00 |
|
|
Kraseo
|
e3c77f2f5a
|
part 4: the one where i slowly go insane
|
2020-03-01 22:05:35 +01:00 |
|
|
ancientpower
|
56ba8ef127
|
requested changes
|
2020-03-01 12:45:00 -06:00 |
|
|
Kraseo
|
d93ade7e03
|
part 2: bloody tendency
|
2020-03-01 17:37:18 +01:00 |
|
|
Trilbyspaceclone
|
cdd97e8547
|
she
|
2020-03-01 00:12:45 -05:00 |
|
|
Trilbyspaceclone
|
e2b706961a
|
Turns out this is Rag's PR and not mine
Neet
Co-Authored-By: Ragolution <bloodlust3333@gmail.com>
|
2020-03-01 00:11:32 -05:00 |
|
|
Trilbyspaceclone
|
3c9d592b8a
|
Update miscellaneous.dm
|
2020-02-29 09:51:40 -05:00 |
|
|
ancientpower
|
f44908dc2e
|
forgot icon state changes
|
2020-02-29 02:03:25 -06:00 |
|
|
ancientpower
|
f48e56fe44
|
thanks mapdiffbot
|
2020-02-29 01:49:42 -06:00 |
|
|
ancientpower
|
c4113824f7
|
more fixes
|
2020-02-29 01:47:19 -06:00 |
|
|
ancientpower
|
ed320046c5
|
fixes icons
|
2020-02-28 11:42:15 -06:00 |
|
|
ancientpower
|
23c3e5b328
|
tweaks for the tweaks
|
2020-02-28 00:17:28 -06:00 |
|
|
ancientpower
|
12ba71f588
|
paramedic tweaks
|
2020-02-27 23:23:44 -06:00 |
|
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
|
kevinz000
|
43c17b4ab3
|
Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
|
2020-02-24 02:30:36 -07:00 |
|
|
kevinz000
|
59074d1174
|
Merge pull request #11183 from Trilbyspaceclone/patch-291
Removes more Trek armor.
|
2020-02-24 02:27:05 -07:00 |
|
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
Trilbyspaceclone
|
4542afa537
|
Update trek.dm
|
2020-02-21 01:14:09 -05:00 |
|
|
Detective Google
|
4c10c830bf
|
Merge remote-tracking branch 'upstream/master' into psych+paramedic
|
2020-02-20 22:17:55 -06:00 |
|
|
Detective Google
|
a8f863f901
|
changes - sprites
|
2020-02-20 22:17:47 -06:00 |
|
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
|
kevinz000
|
a5f06430e4
|
repulse armor sanity (#10949)
|
2020-02-16 07:36:50 +01:00 |
|
|
Trilbyspaceclone
|
661e01ca0c
|
Update miscellaneous.dm (#11094)
|
2020-02-15 19:12:19 +01:00 |
|
|
Ghom
|
06d38eb3dc
|
Merge pull request #11086 from YakumoChen/the-ring-2
Ring Improvements
|
2020-02-15 09:04:54 +01:00 |
|
|
YakumoChen
|
2924be6a80
|
now with visible rings on hand(s)
|
2020-02-14 03:52:10 +00:00 |
|
|
YakumoChen
|
5c246fd389
|
diamond ring changes
More code I stole from RP
|
2020-02-14 03:00:31 +00:00 |
|
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
|
Trilbyspaceclone
|
551a2593d4
|
Update color.dm
|
2020-02-12 14:28:57 -05:00 |
|
|
Trilbyspaceclone
|
1b06506209
|
Update color.dm
|
2020-02-11 15:54:37 -05:00 |
|
|
Trilbyspaceclone
|
a8778417e4
|
Update standard.dm
|
2020-02-11 15:52:41 -05:00 |
|
|
Lin
|
4f546c90e3
|
Merge pull request #10982 from Ghommie/Ghommie-cit566
something about suit_digi.dmi
|
2020-02-10 20:24:35 +00:00 |
|
|
Arturlang
|
29207b22fb
|
Merge branch 'master' into debug_outfit_updates
|
2020-02-09 22:05:26 +02:00 |
|
|
Ghommie
|
98a525568f
|
Ok.
|
2020-02-08 23:59:20 +01:00 |
|
|
Ghommie
|
3485d82dd0
|
salty digi man bad.
|
2020-02-08 23:58:05 +01:00 |
|
|
kevinz000
|
de2a3c5502
|
Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
|
2020-02-06 23:53:54 -07:00 |
|
|
kevinz000
|
3f5805a9e8
|
Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
|
2020-02-06 23:52:49 -07:00 |
|
|
Artur
|
c9dc35fd9a
|
Updates the debug outfit
|
2020-02-06 18:42:23 +01:00 |
|
|
Ghom
|
4cdade4b2d
|
Merge pull request #10788 from Seris02/crushboots
crushing magboots for tators
|
2020-02-05 07:36:14 +01:00 |
|
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
|
Ghom
|
fb32b018ef
|
Merge pull request #10838 from Owai-Seek/loadout
Minor Loadout/Outfit Changes
|
2020-02-02 18:07:00 +01:00 |
|