Commit Graph

29294 Commits

Author SHA1 Message Date
Trilbyspaceclone
fa40490915 Update sheet_types.dm 2020-02-01 01:08:14 -05:00
CitadelStationBot
133da9bdef Automatic changelog generation for PR #10821 [ci skip] 2020-01-31 20:35:24 -06:00
Ghom
953c10c511 Merge pull request #10821 from ShadeAware/switchbladefix
FIXES FANCY SWITCHBLADES
2020-02-01 03:35:22 +01:00
ShadeAware
c46c683664 FIXES FANCY SWITCHBLADES
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
2020-01-31 21:12:08 -05:00
CitadelStationBot
4d1f0144ef Automatic changelog generation for PR #10781 [ci skip] 2020-01-31 18:49:02 -06:00
Ghom
c9e315a9e6 Merge pull request #10781 from r4d6/RPD
RPD icon reorder, less building pixelhunting
2020-02-01 01:48:59 +01:00
CitadelStationBot
c982369910 Automatic changelog generation for PR #10559 [ci skip] 2020-01-31 18:46:18 -06:00
Ghom
5257ab2e00 Merge pull request #10559 from Seris02/custompie
custom reagent pie smite
2020-02-01 01:46:15 +01:00
CitadelStationBot
f5aa5f50f9 Automatic changelog generation for PR #10776 [ci skip] 2020-01-31 18:44:57 -06:00
Ghom
7fdabe81ab Merge pull request #10776 from Hatterhat/hecksuitgolres
heck suit resistances - goliath resistance and also acid-proof
2020-02-01 01:44:54 +01:00
CitadelStationBot
bf4e07cc75 Automatic changelog generation for PR #10777 [ci skip] 2020-01-31 18:44:22 -06:00
Ghom
fddd79b466 Merge pull request #10777 from Citadel-Station-13/kevinz000-patch-4
Gangs can now only tag with GANG spraycans, rather than lathed spraycans
2020-02-01 01:44:19 +01:00
CitadelStationBot
d292b102b3 Automatic changelog generation for PR #10786 [ci skip] 2020-01-31 18:42:58 -06:00
Ghom
327bfcac2f Merge pull request #10786 from Commandersand/frick
made the centcomm suit syndies order be a variant with no sensors
2020-02-01 01:42:55 +01:00
Ghom
0925dc55c2 Merge pull request #10789 from Putnam3145/whoops-text
Minor typo fix
2020-02-01 01:42:08 +01:00
CitadelStationBot
396d712857 Automatic changelog generation for PR #10793 [ci skip] 2020-01-31 18:41:39 -06:00
Ghom
1c5fe85545 Merge pull request #10793 from Tupinambis/MaskBugFix
Masks are now PROPERLY hidden my headgear that hides masks (Spacesuits, Hardsuits, Rad Hoods, Etc.)
2020-02-01 01:41:36 +01:00
Lin
235ac2d27c Merge pull request #10815 from Putnam3145/locales-are-bad
stop it with the unicode spam in the atmos defines
2020-01-31 22:13:56 +00:00
Putnam
e70dac7c54 stop it with the unicode spam
god
2020-01-31 13:35:17 -08:00
CitadelStationBot
54659185c7 Automatic changelog generation for PR #10790 [ci skip] 2020-01-31 11:03:43 -06:00
Lin
4ced8f62fa Merge pull request #10790 from Citadel-Station-13/Ghommie-patch-1
A little load_character() fix: removing gender restrictions for undergarments/hair styles yet again.
2020-01-31 17:03:40 +00:00
CitadelStationBot
9d1f897f29 Automatic changelog generation for PR #10782 [ci skip] 2020-01-31 10:58:50 -06:00
Lin
ad4a4b3797 Merge pull request #10782 from Citadel-Station-13/kevinz000-patch-16
nonlethal dueling pistols are now not access locked, lethal ones are now armory locked. also, dueling pistols show their duel datum id (which is added) for better finding when you have many pairs.
2020-01-31 16:58:47 +00:00
CitadelStationBot
24336a7fc7 Automatic changelog generation for PR #10809 [ci skip] 2020-01-31 10:57:42 -06:00
Ghom
b79793f688 Merge pull request #10809 from Arturlang/patch-6
Fixes switchblade silvering
2020-01-31 17:57:39 +01:00
Arturlang
d26ca9dbf0 Fixes this 2020-01-31 13:57:30 +01:00
Seris02
70c41e5bd7 happy now 2020-01-31 15:08:16 +08:00
CitadelStationBot
e142496ef5 Automatic changelog generation for PR #10795 [ci skip] 2020-01-30 21:39:30 -06:00
Ghom
0f4ea974c4 Merge pull request #10795 from ShadeAware/master
FIXES THE SWITCHBLADE CRAFTING THING
2020-01-31 04:39:27 +01:00
ShadeAware
5b43b2fac7 Update recipes_weapon_and_ammo.dm 2020-01-30 17:01:28 -05:00
CitadelStationBot
21b8f0515d Automatic changelog generation for PR #10768 [ci skip] 2020-01-30 15:46:43 -06:00
Lin
2b47d868ad Merge pull request #10768 from kevinz000/quick_thing
moths can now chitter, and their laughs are now "unique"
2020-01-30 21:46:41 +00:00
Tupinambis
e5ee5595e0 How the fuck was this not fixed for like a year. 2020-01-30 15:22:41 -06:00
CitadelStationBot
bb4016f13a Automatic changelog generation for PR #10644 [ci skip] 2020-01-30 14:30:58 -06:00
Ghom
15e5f0ef5d Merge pull request #10644 from ShadeAware/master
Craftable Switchblades: The Finale
2020-01-30 21:30:55 +01:00
Ghom
d92a67f582 I'm sorry what? 2020-01-30 18:08:43 +01:00
Ghom
63560e191e A little load_character() fix: re-re-removing gender restrictions for underwear/hair styles. 2020-01-30 18:03:58 +01:00
Putnam
e9c3eb9eb4 . 2020-01-30 04:24:18 -08:00
loginsandylogout
7054e697db spacing 2020-01-30 02:07:59 -06:00
Commandersand
27c915ec75 honk 2020-01-30 02:04:48 -06:00
CitadelStationBot
55a0e4e55d Automatic changelog generation for PR #9860 [ci skip] 2020-01-29 21:15:26 -06:00
kevinz000
e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
2020-01-29 20:15:22 -07:00
Ghom
1caa2af4cf Update weaponry.dm 2020-01-30 04:05:35 +01:00
CitadelStationBot
0316a15142 Automatic changelog generation for PR #10746 [ci skip] 2020-01-29 21:01:19 -06:00
Ghom
c96267eb06 Merge pull request #10746 from Citadel-Station-13/kevinz000-patch-9
CAPTURE THE FLAG NOW HAS CLAYMORES
2020-01-30 04:01:17 +01:00
Ghom
96e6e5903d Merge pull request #10783 from r4d6/fix
AAAAAAH
2020-01-30 04:00:07 +01:00
r4d6
cd048ebd77 AAAAAAH 2020-01-29 21:50:55 -05:00
Ghom
793cc26ddc Update weaponry.dm 2020-01-30 03:28:47 +01:00
Ghom
096d9e01e1 Update weaponry.dm 2020-01-30 03:19:04 +01:00
Ghom
b2ca380a13 Update weaponry.dm 2020-01-30 03:15:24 +01:00