Commit Graph

1340 Commits

Author SHA1 Message Date
silicons
16fec8831a Merge pull request #13230 from Detective-Google/reskin-obj
reskin_obj is now a radial
2020-08-29 21:33:28 -07:00
Detective-Google
9f7a358bb9 plasmamen are playable now 2020-08-27 11:37:13 -05:00
silicons
64968bd655 Merge pull request #13242 from Literallynotpickles/coat-sensors
lets you equip handheld crew monitors on all med winter coats
2020-08-23 17:41:10 -07:00
silicons
82d8b7266f Merge pull request #13238 from Hatterhat/insidious-tackle
insidious combat gloves but they can tackle now
2020-08-23 17:36:03 -07:00
silicons
7f942abef2 Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
2020-08-23 05:08:14 -07:00
Suicidalpickles
811a6708df h 2020-08-22 18:01:18 -07:00
silicons
c7c74e7c51 Merge pull request #13213 from lolman360/breath
breath mask balaclava
2020-08-22 15:22:04 -07:00
zerothebigboy
21836b4ec8 : ) 2020-08-22 18:11:03 -04:00
Hatterhat
8645a2954f tackle hando 2020-08-22 16:13:41 -05:00
Detective Google
0fbd27fcfb reskin_obj is now a radial 2020-08-21 14:57:11 -05:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
lolman360
4259332cfd e 2020-08-19 18:37:31 +10:00
Sishen
bb94bf25fb e 2020-08-13 21:39:00 -06:00
silicons
a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
silicons
2d01c4db5b Merge pull request #13106 from zeroisthebiggay/cesuitgoclick
ce hardsuit no longer requires a jumpsuit to actually be fully radproof
2020-08-11 01:43:54 -07:00
silicons
5694923d89 Merge pull request #13095 from lolman360/liver
custom name/desc ring and necklace
2020-08-11 01:41:48 -07:00
zerothebigboy
9baedbd904 a 2020-08-10 10:08:25 -04:00
zerothebigboy
cf75f7d4b6 a 2020-08-10 10:08:15 -04:00
lolman360
c9de596fde Verified! 2020-08-09 15:31:49 +10:00
lolman360
50448549fb ee 2020-08-09 15:26:08 +10:00
Lynxless
14e35806b9 I hope this works 2020-08-07 16:23:15 -03:00
silicons
1586625e6b Merge pull request #12960 from timothyteakettle/loadout-you-say
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
Timothy Teakettle
5f8ed3ee3a acidproof 2020-08-03 22:14:42 +01:00
Timothy Teakettle
3a0b34fb1b funny aim go brr 2020-08-03 21:58:58 +01:00
Timothy Teakettle
6fdfc19ea0 why can i not spell 2020-08-03 17:39:45 +01:00
Timothy Teakettle
da05108dd0 woops 2020-08-03 17:37:58 +01:00
Timothy Teakettle
2153f9ea35 i too, want people to be hit their ricochets 2020-08-03 17:36:40 +01:00
Timothy Teakettle
34e2bd626f woops 2020-08-03 14:50:19 +01:00
Timothy Teakettle
0bf9553eca hmm 2020-08-02 19:13:39 +01:00
Timothy Teakettle
289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
Timothy Teakettle
03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01:00
silicons
06f5ce6401 buffs shoving (#12925)
* ^w^

* ok

* ok
2020-08-02 18:30:09 +02:00
Lin
41a711ff01 Merge pull request #12959 from Citadel-Station-13/AAAAAAA
FIXES LINTER ON MASTER
2020-07-29 15:59:20 -05:00
Lin
a7fe7f1317 Merge pull request #12953 from Adelphon/pog
Adds Camo To AutoDrobe (fix)
2020-07-29 15:48:45 -05:00
Timothy Teakettle
b5a16d8945 MORE CLOTHES 2020-07-29 18:20:46 +01:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons
bc823b544f sigh 2020-07-29 01:17:16 -07:00
Lin
a5dd08a054 Merge pull request #12734 from silicons/shoelaces
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
Adelphon
1f508ef15d Adds Camo To AutoDrobe (fix)
Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.
2020-07-28 15:04:58 -04:00
silicons
cac1627d26 Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion
Ports RP flannel jackets and a winter coat
2020-07-28 10:45:54 -07:00
silicons
67b518bf42 experimental 2020-07-27 13:09:54 -07:00
silicons
32b8528b16 Merge pull request #12921 from TheObserver-sys/LOOKGORDONATAG!
Adds tags to applicable clothing, stating the defenses and resistances said clothes have.
2020-07-26 22:59:55 -07:00
silicons
20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb
tidies up species files
2020-07-26 22:52:00 -07:00
zerothebigboy
6329b2a760 a 2020-07-26 23:32:36 -04:00
silicons
e13b6d36da Merge pull request #12895 from Hatterhat/bokken
Training Bokkens - "funny wood sticks for parrying and beating the shit out of people"
2020-07-26 15:52:35 -07:00
silicons
49070d732b ohhhhhhh boy 2020-07-26 15:10:08 -07:00
Hatterhat
af08e8a37f altclick for fucked up parries! also bugfixes 2020-07-26 13:02:56 -05:00
Timothy Teakettle
36d6246bc1 it is now harder to deal wounds 2020-07-26 18:54:57 +01:00
Timothy Teakettle
75c40f6d93 what if wound values didnt suck 2020-07-26 18:51:19 +01:00