Commit Graph

18827 Commits

Author SHA1 Message Date
Ghom 3337181cac Merge pull request #10352 from Seris02/smchanges
Changes to the way SM handles power related to integrity and max integrity damage
2020-02-01 18:46:10 +01:00
Ghom 051811ed46 Merge pull request #10811 from Arturlang/crafting_componitization
[READY]Ports TG updates to crafting and componentizes it
2020-02-01 18:36:51 +01:00
Ghom 45af9dc013 Merge pull request #10808 from Arturlang/macros_begone
[READY] Ports chem dispenser macro recording
2020-02-01 18:22:57 +01:00
Putnam3145 12f0c35660 Merge pull request #10803 from Seris02/highlightfix
fixes the whitespace that gets created when you have highlighting strings on
2020-02-01 04:15:47 -08:00
Putnam3145 17e08280b1 Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9
fixes a very likely race condition in dueling pistols
2020-02-01 04:15:32 -08:00
Ghom ed3ebd16a8 Merge pull request #10830 from Seris02/nomoreglitches
[s] fixes a glitch with the PKA
2020-02-01 10:06:58 +01:00
Seris02 3c8dcbbcd2 merp 2020-02-01 16:02:30 +08:00
Seris02 fc70b88b06 actually we only need it here 2020-02-01 11:51:15 +08:00
Seris02 20308b54dd exploit fix 2020-02-01 11:48:55 +08:00
ShadeAware c46c683664 FIXES FANCY SWITCHBLADES
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
2020-01-31 21:12:08 -05:00
Artur b4763d947e Kills macrotier 2020-02-01 03:03:55 +01:00
Ghom c9e315a9e6 Merge pull request #10781 from r4d6/RPD
RPD icon reorder, less building pixelhunting
2020-02-01 01:48:59 +01:00
Ghom 5257ab2e00 Merge pull request #10559 from Seris02/custompie
custom reagent pie smite
2020-02-01 01:46:15 +01: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
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
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 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
Artur 880e8c3e04 Whoopsie 2020-01-31 22:34:01 +01:00
Artur dd1083e7da How did i fuck up this bad 2020-01-31 18:32:12 +01:00
Artur d0b03877ea Should be right now 2020-01-31 18:24:49 +01:00
Artur bcb2bfca02 Why did tg remove this 2020-01-31 18:21:00 +01:00
Artur 8bb0e30036 Initial Commit V3 2020-01-31 18:17:14 +01: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
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
Arturlang d26ca9dbf0 Fixes this 2020-01-31 13:57:30 +01:00
Artur bb8eed7ae6 Initial Commit 2020-01-31 13:41:49 +01:00
kevinz000 97caad18c5 Update dueling.dm 2020-01-31 01:18:43 -07:00
Seris02 70c41e5bd7 happy now 2020-01-31 15:08:16 +08:00
Seris02 a354f8fb66 fixes highlighting strings 2020-01-31 14:56:28 +08: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
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
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
loginsandylogout 7054e697db spacing 2020-01-30 02:07:59 -06:00
Commandersand 27c915ec75 honk 2020-01-30 02:04:48 -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
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
kevinz000 831fafb72b Update dueling.dm 2020-01-29 19:06:11 -07:00
kevinz000 562659b5b8 Update dueling.dm 2020-01-29 19:00:11 -07:00