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

12212 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
Artur
b4763d947e Kills macrotier 2020-02-01 03:03:55 +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
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
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
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
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
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
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
Ghom
f74475a6e0 Merge pull request #10749 from kevinz000/duke_moxley 
It's high noon...
 2020-01-30 00:19:37 +01: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
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