necromanceranne
|
5c2e244ee0
|
Ports /tg/ pr #44529, reverts #9092
|
2020-02-16 22:20:50 +11:00 |
|
Seris02
|
4ec99a38e2
|
merge fixes
|
2020-02-07 15:28:05 +08:00 |
|
kevinz000
|
de2a3c5502
|
Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
|
2020-02-06 23:53:54 -07:00 |
|
Seris02
|
d0100345fd
|
done hopefully
|
2020-02-05 17:00:38 +08:00 |
|
Seris02
|
6cc6aa12be
|
yeehaw it's done
|
2020-02-05 16:54:57 +08:00 |
|
Ghom
|
4cdade4b2d
|
Merge pull request #10788 from Seris02/crushboots
crushing magboots for tators
|
2020-02-05 07:36:14 +01:00 |
|
Ghommie
|
81b5fe2de3
|
Further buff and fix for clown ops tearstache nade.
|
2020-02-03 07:08:47 +01:00 |
|
Ghom
|
97be223b0b
|
Merge pull request #10799 from Seris02/goldentoolboxfix
makes the golden ""plastitanium"" toolbox actually plastitanium
|
2020-02-02 19:08:16 +01:00 |
|
Seris02
|
d3d4a9f05b
|
Update code/modules/uplink/uplink_items/uplink_roles.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-02 12:21:32 +08:00 |
|
Seris02
|
8053e43838
|
Update code/modules/uplink/uplink_items/uplink_roles.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-02 12:21:26 +08:00 |
|
Ghom
|
1745308cc5
|
Forgot about this.
|
2020-02-01 02:14:14 +01:00 |
|
Ghommie
|
af9060cc15
|
clown ops uplink consistency.
|
2020-02-01 00:03:58 +01:00 |
|
Seris02
|
81039b131b
|
fixes
|
2020-01-31 09:49:08 +08:00 |
|
Seris02
|
a415dbf31b
|
yas
|
2020-01-31 08:19:35 +08:00 |
|
Seris02
|
88e42b2e15
|
*crunch crunch stomp stomp*
|
2020-01-30 18:07:35 +08:00 |
|
Seris02
|
bf47daf099
|
MY PRECIOUS! GONE!! GOOOOOONE!!!
|
2020-01-30 17:00:14 +08:00 |
|
Seris02
|
e45cc4933c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-27 08:33:38 +08:00 |
|
Seris02
|
90c7149d8c
|
merge conflict fixes
|
2020-01-24 10:27:48 +08:00 |
|
Seris02
|
a100f9382e
|
better, there, happy now github
|
2020-01-20 14:51:53 +08:00 |
|
Seris02
|
04b34ec8ed
|
hijack implant
|
2020-01-18 18:04:31 +08:00 |
|
Ghommie
|
2fe23b67db
|
fug
|
2020-01-18 03:37:30 +01: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 |
|
Seris02
|
b22ec2ffd8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade
|
2020-01-12 11:14:33 +08:00 |
|
TrilbySpaceClone
|
74d881388e
|
so much cleaner
|
2020-01-09 15:42:09 -05:00 |
|