shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,294 Commits 5 Branches 0 Tags
fa40490915380c7d8dcf91f104f3014a3f6c8bca
Commit Graph

18806 Commits

Author SHA1 Message Date
Trilbyspaceclone
fa40490915 Update sheet_types.dm 2020-02-01 01:08:14 -05:00
ShadeAware
c46c683664 FIXES FANCY SWITCHBLADES 
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
 2020-01-31 21:12:08 -05: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
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
Seris02
70c41e5bd7 happy now 2020-01-31 15:08:16 +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
r4d6
58b969b8c6 Update RPD.dm 2020-01-29 20:34:57 -05:00
kevinz000
0e1c46150f Merge pull request #10767 from KeRSedChaplain/gangnerf 
Removes stim packs from gangs
 2020-01-29 16:24:51 -07:00
Ghom
f74475a6e0 Merge pull request #10749 from kevinz000/duke_moxley 
It's high noon...
 2020-01-30 00:19:37 +01:00
kevinz000
0f4e30c2db Update crayons.dm 2020-01-29 16:13:29 -07:00
kevinz000
e3a3c8f241 woops 2020-01-29 15:45:57 -07:00
Hatterhat
41a3dc64d5 what 2020-01-29 16:44:01 -06:00
Lin
cde6601c60 Merge pull request #10759 from Ghommie/Ghommie-cit534 
demodularize and removes lot of unused clothing with missing sprites.
 2020-01-29 19:58:26 +00:00
Lin
293e6576c8 Merge pull request #10564 from kevinz000/optimization_1 
Experimental optimizations
 2020-01-29 19:25:13 +00:00
r4d6
c57dedd808 fix 2020-01-29 12:30:05 -05:00
Ghom
7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2 
Brain surgery can now fix an abductee's mindsnap objectives
 2020-01-29 05:34:49 +01:00
Ghom
dca1d8bcd3 Merge pull request #10761 from Putnam3145/fix-forced-gender 
Makes gender change potion not work on people with pref
 2020-01-29 05:31:18 +01:00
Ghom
44c141f009 Merge branch 'master' into hugbox_meteor_time 2020-01-29 02:28:12 +01:00
Ghom
3671f58612 Merge pull request #10751 from Citadel-Station-13/kevinz000-patch-14-1 
traitor+bro now have a minimum population of 25
 2020-01-29 02:16:38 +01:00
Ghom
cf3466252e Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4 
[s] more reasonable reagent logging
 2020-01-29 01:59:09 +01:00
kevinz000
d3343a1e26 Merge pull request #10697 from Citadel-Station-13/Ghommie-patch-2 
Makes transfer_ckey() less pedant.
 2020-01-28 17:59:00 -07:00
Putnam3145
6d6c101044 Merge pull request #10713 from Citadel-Station-13/kevinz000-patch-7 
[s] botany logging
 2020-01-28 16:57:50 -08:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00