Ghom
6a0af190ea
I'm a bit busy handling multiple issues.
2020-04-17 20:47:02 +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
616d482cf6
Deleting poly clothes copypasta.
2020-04-13 22:51:46 +02:00
Ghommie
0816512150
more work.
2020-04-13 16:09:52 +02:00
Ghommie
05a954f000
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 02:01:01 +02:00
kevinz000
d60932ca5d
Merge pull request #11697 from Ghommie/Ghommie-cit655
...
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
spookydonut
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
Ghommie
7c1e5aa2c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-09 15:46:19 +02:00
Ghommie
d2b624a908
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
2020-04-09 14:59:40 +02:00
Lin
8379169b81
Merge pull request #11476 from kevinz000/shield_refactor
...
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
Trilbyspaceclone
faf199fc35
Corrects Plasmamen sec jumpsuits not starting with MAXIUM tracking ( #11747 )
...
* Update security.dm
* Update civilian_service.dm
* why is their so many more lines of the same code here?
* Update rnd.dm
* clears up sec file so that they all use a base
* Update curator.dm
2020-04-06 17:53:43 +02:00
Ghommie
56669f9296
Minor snowflakes clothing variations refactor. Removal of copypasted states.
2020-04-04 00:22:18 +02:00
Ghommie
2bf6d888bd
Ports "Obliterates item_color: new washing machine functionality edition"
2020-03-30 18:31:26 +02:00
Ghommie
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
kevinz000
bf0970d8c3
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-23 15:34:04 -07:00
Ghommie
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
kevinz000
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -07:00
ZeroMan
bc5e850516
i still feel pain
2020-03-20 13:35:55 -04:00
ZeroMan
96d897a0fb
i hurt myself today
2020-03-20 13:33:07 -04:00
ZeroMan
35a4d71a54
im sorry little one
2020-03-19 21:59:14 -04:00
kevinz000
7fdbcc55c6
s
2020-03-16 11:12:10 -07:00
kevinz000
d3724d5fbd
f
2020-03-16 10:59:34 -07:00
kevinz000
6af9c54da5
better
2020-03-16 04:59:55 -07:00
kevinz000
a77be038b8
refactoring this whole thing again
2020-03-16 04:56:32 -07:00
kevinz000
2a9e4bebdd
priority
2020-03-16 04:24:18 -07:00
kevinz000
644273beca
k
2020-03-16 04:09:25 -07:00
Ghommie
2b4b626fac
support for items that switch states through update_icon.
2020-03-10 16:55:30 +01: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
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06: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
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
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
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
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
Winter Flare
599185654f
Rename, Add item to Loadout
...
Renamed scrubs based on color, added Mailman Hat to loadout.
2020-01-31 21:54:21 -05:00
loginsandylogout
7054e697db
spacing
2020-01-30 02:07:59 -06:00
Commandersand
27c915ec75
honk
2020-01-30 02:04:48 -06:00
Ghommie
5875f2578c
demodularize and removes lot of unused clothing with missing sprites.
2020-01-28 02:32:46 +01:00
Unknown
bd8ce9a7b6
Culturally Appropriate Lunar Clothes
2020-01-23 06:35:50 -07:00
Ghommie
224146ee1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444
2020-01-18 03:36:09 +01:00
Hatterhat
7b322ff467
Merge branch 'master' into greytide-standard-uniform
2020-01-14 19:39:16 -06:00
Ghommie
26d6e7f05c
Work.
2020-01-14 22:04:38 +01:00
