Commit Graph

1358 Commits

Author SHA1 Message Date
silicons
ebcbe7e901 Merge pull request #13431 from EmeraldSundisk/cargoclothes
Gives Cargo Technicians the choice of longer trousers.
2020-10-01 03:03:41 -07:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Ghom
a2597a4d84 Merge pull request #13448 from Tupinambis/spelling
Fixes a spelling error in an armor value that caused runtimes.
2020-10-01 11:42:55 +02:00
EmeraldSundisk
7f0834608e Merge pull request #65 from EmeraldSundisk/Citadel-Station-13-master
Citadel station 13 master
2020-09-27 10:09:12 -07:00
silicons
c17929e889 Merge pull request #13419 from Degirin2120/09/22/20_engi_hazard_jumpsuits
Adds engineering hazard jumpsuits
2020-09-27 00:11:30 -07:00
Tupinambis
87ac8d06c7 Fixes a spelling error in a variable 2020-09-27 00:59:50 -05:00
Mark9013100
e4f9849cc3 Adds engineering hazard jumpsuits 2020-09-25 15:40:38 -04:00
EmeraldSundisk
079d4eeb58 Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master
ffs
2020-09-24 19:18:50 -07:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
EmeraldSundisk
186f13f56c Revert "icon should work now I hope"
This reverts commit 179b9ba05d.
2020-09-24 09:38:26 -07:00
EmeraldSundisk
179b9ba05d icon should work now I hope 2020-09-23 21:49:26 -07:00
EmeraldSundisk
8ced447303 cargo tech code 2020-09-19 15:29:27 -07:00
YakumoChen
9c7b43a83b mech suits 2020-09-18 21:13:08 +00:00
silicons
89f246db39 Merge pull request #13373 from BlueWildrose/why_my_hood_no_color
Fixed toggleable polychromic hoods/helmets not polychroming with their suit
2020-09-11 14:14:16 -07:00
Blue Wildrose
680872e08b 100% less band-aidy polyhood solution 2020-09-10 21:02:27 -07:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Ghommie
4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
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
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +01: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